-{
- private static final long serialVersionUID = -1185015143654744140L;
-
- /**
- * SecureRandom 鐨勫崟渚
- *
- */
- private static class Holder
- {
- static final SecureRandom numberGenerator = getSecureRandom();
- }
-
- /** 姝UID鐨勬渶楂64鏈夋晥浣 */
- private final long mostSigBits;
-
- /** 姝UID鐨勬渶浣64鏈夋晥浣 */
- private final long leastSigBits;
-
- /**
- * 绉佹湁鏋勯
- *
- * @param data 鏁版嵁
- */
- private UUID(byte[] data)
- {
- long msb = 0;
- long lsb = 0;
- assert data.length == 16 : "data must be 16 bytes in length";
- for (int i = 0; i < 8; i++)
- {
- msb = (msb << 8) | (data[i] & 0xff);
- }
- for (int i = 8; i < 16; i++)
- {
- lsb = (lsb << 8) | (data[i] & 0xff);
- }
- this.mostSigBits = msb;
- this.leastSigBits = lsb;
- }
-
- /**
- * 浣跨敤鎸囧畾鐨勬暟鎹瀯閫犳柊鐨 UUID銆
- *
- * @param mostSigBits 鐢ㄤ簬 {@code UUID} 鐨勬渶楂樻湁鏁 64 浣
- * @param leastSigBits 鐢ㄤ簬 {@code UUID} 鐨勬渶浣庢湁鏁 64 浣
- */
- public UUID(long mostSigBits, long leastSigBits)
- {
- this.mostSigBits = mostSigBits;
- this.leastSigBits = leastSigBits;
- }
-
- /**
- * 鑾峰彇绫诲瀷 4锛堜吉闅忔満鐢熸垚鐨勶級UUID 鐨勯潤鎬佸伐鍘傘 浣跨敤鍔犲瘑鐨勬湰鍦扮嚎绋嬩吉闅忔満鏁扮敓鎴愬櫒鐢熸垚璇 UUID銆
- *
- * @return 闅忔満鐢熸垚鐨 {@code UUID}
- */
- public static UUID fastUUID()
- {
- return randomUUID(false);
- }
-
- /**
- * 鑾峰彇绫诲瀷 4锛堜吉闅忔満鐢熸垚鐨勶級UUID 鐨勯潤鎬佸伐鍘傘 浣跨敤鍔犲瘑鐨勫己浼殢鏈烘暟鐢熸垚鍣ㄧ敓鎴愯 UUID銆
- *
- * @return 闅忔満鐢熸垚鐨 {@code UUID}
- */
- public static UUID randomUUID()
- {
- return randomUUID(true);
- }
-
- /**
- * 鑾峰彇绫诲瀷 4锛堜吉闅忔満鐢熸垚鐨勶級UUID 鐨勯潤鎬佸伐鍘傘 浣跨敤鍔犲瘑鐨勫己浼殢鏈烘暟鐢熸垚鍣ㄧ敓鎴愯 UUID銆
- *
- * @param isSecure 鏄惁浣跨敤{@link SecureRandom}濡傛灉鏄彲浠ヨ幏寰楁洿瀹夊叏鐨勯殢鏈虹爜锛屽惁鍒欏彲浠ュ緱鍒版洿濂界殑鎬ц兘
- * @return 闅忔満鐢熸垚鐨 {@code UUID}
- */
- public static UUID randomUUID(boolean isSecure)
- {
- final Random ng = isSecure ? Holder.numberGenerator : getRandom();
-
- byte[] randomBytes = new byte[16];
- ng.nextBytes(randomBytes);
- randomBytes[6] &= 0x0f; /* clear version */
- randomBytes[6] |= 0x40; /* set to version 4 */
- randomBytes[8] &= 0x3f; /* clear variant */
- randomBytes[8] |= 0x80; /* set to IETF variant */
- return new UUID(randomBytes);
- }
-
- /**
- * 鏍规嵁鎸囧畾鐨勫瓧鑺傛暟缁勮幏鍙栫被鍨 3锛堝熀浜庡悕绉扮殑锛塙UID 鐨勯潤鎬佸伐鍘傘
- *
- * @param name 鐢ㄤ簬鏋勯 UUID 鐨勫瓧鑺傛暟缁勩
- *
- * @return 鏍规嵁鎸囧畾鏁扮粍鐢熸垚鐨 {@code UUID}
- */
- public static UUID nameUUIDFromBytes(byte[] name)
- {
- MessageDigest md;
- try
- {
- md = MessageDigest.getInstance("MD5");
- }
- catch (NoSuchAlgorithmException nsae)
- {
- throw new InternalError("MD5 not supported");
- }
- byte[] md5Bytes = md.digest(name);
- md5Bytes[6] &= 0x0f; /* clear version */
- md5Bytes[6] |= 0x30; /* set to version 3 */
- md5Bytes[8] &= 0x3f; /* clear variant */
- md5Bytes[8] |= 0x80; /* set to IETF variant */
- return new UUID(md5Bytes);
- }
-
- /**
- * 鏍规嵁 {@link #toString()} 鏂规硶涓弿杩扮殑瀛楃涓叉爣鍑嗚〃绀哄舰寮忓垱寤簕@code UUID}銆
- *
- * @param name 鎸囧畾 {@code UUID} 瀛楃涓
- * @return 鍏锋湁鎸囧畾鍊肩殑 {@code UUID}
- * @throws IllegalArgumentException 濡傛灉 name 涓 {@link #toString} 涓弿杩扮殑瀛楃涓茶〃绀哄舰寮忎笉绗︽姏鍑烘寮傚父
- *
- */
- public static UUID fromString(String name)
- {
- String[] components = name.split("-");
- if (components.length != 5)
- {
- throw new IllegalArgumentException("Invalid UUID string: " + name);
- }
- for (int i = 0; i < 5; i++)
- {
- components[i] = "0x" + components[i];
- }
-
- long mostSigBits = Long.decode(components[0]).longValue();
- mostSigBits <<= 16;
- mostSigBits |= Long.decode(components[1]).longValue();
- mostSigBits <<= 16;
- mostSigBits |= Long.decode(components[2]).longValue();
-
- long leastSigBits = Long.decode(components[3]).longValue();
- leastSigBits <<= 48;
- leastSigBits |= Long.decode(components[4]).longValue();
-
- return new UUID(mostSigBits, leastSigBits);
- }
-
- /**
- * 杩斿洖姝 UUID 鐨 128 浣嶅间腑鐨勬渶浣庢湁鏁 64 浣嶃
- *
- * @return 姝 UUID 鐨 128 浣嶅间腑鐨勬渶浣庢湁鏁 64 浣嶃
- */
- public long getLeastSignificantBits()
- {
- return leastSigBits;
- }
-
- /**
- * 杩斿洖姝 UUID 鐨 128 浣嶅间腑鐨勬渶楂樻湁鏁 64 浣嶃
- *
- * @return 姝 UUID 鐨 128 浣嶅间腑鏈楂樻湁鏁 64 浣嶃
- */
- public long getMostSignificantBits()
- {
- return mostSigBits;
- }
-
- /**
- * 涓庢 {@code UUID} 鐩稿叧鑱旂殑鐗堟湰鍙. 鐗堟湰鍙锋弿杩版 {@code UUID} 鏄浣曠敓鎴愮殑銆
- *
- * 鐗堟湰鍙峰叿鏈変互涓嬪惈鎰:
- *
- * - 1 鍩轰簬鏃堕棿鐨 UUID
- *
- 2 DCE 瀹夊叏 UUID
- *
- 3 鍩轰簬鍚嶇О鐨 UUID
- *
- 4 闅忔満鐢熸垚鐨 UUID
- *
- *
- * @return 姝 {@code UUID} 鐨勭増鏈彿
- */
- public int version()
- {
- // Version is bits masked by 0x000000000000F000 in MS long
- return (int) ((mostSigBits >> 12) & 0x0f);
- }
-
- /**
- * 涓庢 {@code UUID} 鐩稿叧鑱旂殑鍙樹綋鍙枫傚彉浣撳彿鎻忚堪 {@code UUID} 鐨勫竷灞銆
- *
- * 鍙樹綋鍙峰叿鏈変互涓嬪惈鎰忥細
- *
- * - 0 涓 NCS 鍚戝悗鍏煎淇濈暀
- *
- 2 IETF RFC 4122(Leach-Salz), 鐢ㄤ簬姝ょ被
- *
- 6 淇濈暀锛屽井杞悜鍚庡吋瀹
- *
- 7 淇濈暀渚涗互鍚庡畾涔変娇鐢
- *
- *
- * @return 姝 {@code UUID} 鐩稿叧鑱旂殑鍙樹綋鍙
- */
- public int variant()
- {
- // This field is composed of a varying number of bits.
- // 0 - - Reserved for NCS backward compatibility
- // 1 0 - The IETF aka Leach-Salz variant (used by this class)
- // 1 1 0 Reserved, Microsoft backward compatibility
- // 1 1 1 Reserved for future definition.
- return (int) ((leastSigBits >>> (64 - (leastSigBits >>> 62))) & (leastSigBits >> 63));
- }
-
- /**
- * 涓庢 UUID 鐩稿叧鑱旂殑鏃堕棿鎴冲笺
- *
- *
- * 60 浣嶇殑鏃堕棿鎴冲兼牴鎹 {@code UUID} 鐨 time_low銆乼ime_mid 鍜 time_hi 瀛楁鏋勯犮
- * 鎵寰楀埌鐨勬椂闂存埑浠 100 姣井绉掍负鍗曚綅锛屼粠 UTC锛堥氱敤鍗忚皟鏃堕棿锛 1582 骞 10 鏈 15 鏃ラ浂鏃跺紑濮嬨
- *
- *
- * 鏃堕棿鎴冲间粎鍦ㄥ湪鍩轰簬鏃堕棿鐨 UUID锛堝叾 version 绫诲瀷涓 1锛変腑鎵嶆湁鎰忎箟銆
- * 濡傛灉姝 {@code UUID} 涓嶆槸鍩轰簬鏃堕棿鐨 UUID锛屽垯姝ゆ柟娉曟姏鍑 UnsupportedOperationException銆
- *
- * @throws UnsupportedOperationException 濡傛灉姝 {@code UUID} 涓嶆槸 version 涓 1 鐨 UUID銆
- */
- public long timestamp() throws UnsupportedOperationException
- {
- checkTimeBase();
- return (mostSigBits & 0x0FFFL) << 48//
- | ((mostSigBits >> 16) & 0x0FFFFL) << 32//
- | mostSigBits >>> 32;
- }
-
- /**
- * 涓庢 UUID 鐩稿叧鑱旂殑鏃堕挓搴忓垪鍊笺
- *
- *
- * 14 浣嶇殑鏃堕挓搴忓垪鍊兼牴鎹 UUID 鐨 clock_seq 瀛楁鏋勯犮俢lock_seq 瀛楁鐢ㄤ簬淇濊瘉鍦ㄥ熀浜庢椂闂寸殑 UUID 涓殑鏃堕棿鍞竴鎬с
- *
- * {@code clockSequence} 鍊间粎鍦ㄥ熀浜庢椂闂寸殑 UUID锛堝叾 version 绫诲瀷涓 1锛変腑鎵嶆湁鎰忎箟銆 濡傛灉姝 UUID 涓嶆槸鍩轰簬鏃堕棿鐨 UUID锛屽垯姝ゆ柟娉曟姏鍑
- * UnsupportedOperationException銆
- *
- * @return 姝 {@code UUID} 鐨勬椂閽熷簭鍒
- *
- * @throws UnsupportedOperationException 濡傛灉姝 UUID 鐨 version 涓嶄负 1
- */
- public int clockSequence() throws UnsupportedOperationException
- {
- checkTimeBase();
- return (int) ((leastSigBits & 0x3FFF000000000000L) >>> 48);
- }
-
- /**
- * 涓庢 UUID 鐩稿叧鐨勮妭鐐瑰笺
- *
- *
- * 48 浣嶇殑鑺傜偣鍊兼牴鎹 UUID 鐨 node 瀛楁鏋勯犮傛瀛楁鏃ㄥ湪鐢ㄤ簬淇濆瓨鏈哄櫒鐨 IEEE 802 鍦板潃锛岃鍦板潃鐢ㄤ簬鐢熸垚姝 UUID 浠ヤ繚璇佺┖闂村敮涓鎬с
- *
- * 鑺傜偣鍊间粎鍦ㄥ熀浜庢椂闂寸殑 UUID锛堝叾 version 绫诲瀷涓 1锛変腑鎵嶆湁鎰忎箟銆
- * 濡傛灉姝 UUID 涓嶆槸鍩轰簬鏃堕棿鐨 UUID锛屽垯姝ゆ柟娉曟姏鍑 UnsupportedOperationException銆
- *
- * @return 姝 {@code UUID} 鐨勮妭鐐瑰
- *
- * @throws UnsupportedOperationException 濡傛灉姝 UUID 鐨 version 涓嶄负 1
- */
- public long node() throws UnsupportedOperationException
- {
- checkTimeBase();
- return leastSigBits & 0x0000FFFFFFFFFFFFL;
- }
-
- /**
- * 杩斿洖姝@code UUID} 鐨勫瓧绗︿覆琛ㄧ幇褰㈠紡銆
- *
- *
- * UUID 鐨勫瓧绗︿覆琛ㄧず褰㈠紡鐢辨 BNF 鎻忚堪锛
- *
- *
- * {@code
- * UUID = ----
- * time_low = 4*
- * time_mid = 2*
- * time_high_and_version = 2*
- * variant_and_sequence = 2*
- * node = 6*
- * hexOctet =
- * hexDigit = [0-9a-fA-F]
- * }
- *
- *
- *
- *
- * @return 姝@code UUID} 鐨勫瓧绗︿覆琛ㄧ幇褰㈠紡
- * @see #toString(boolean)
- */
- @Override
- public String toString()
- {
- return toString(false);
- }
-
- /**
- * 杩斿洖姝@code UUID} 鐨勫瓧绗︿覆琛ㄧ幇褰㈠紡銆
- *
- *
- * UUID 鐨勫瓧绗︿覆琛ㄧず褰㈠紡鐢辨 BNF 鎻忚堪锛
- *
- *
- * {@code
- * UUID = ----
- * time_low = 4*
- * time_mid = 2*
- * time_high_and_version = 2*
- * variant_and_sequence = 2*
- * node = 6*
- * hexOctet =
- * hexDigit = [0-9a-fA-F]
- * }
- *
- *
- *
- *
- * @param isSimple 鏄惁绠鍗曟ā寮忥紝绠鍗曟ā寮忎负涓嶅甫'-'鐨刄UID瀛楃涓
- * @return 姝@code UUID} 鐨勫瓧绗︿覆琛ㄧ幇褰㈠紡
- */
- public String toString(boolean isSimple)
- {
- final StringBuilder builder = new StringBuilder(isSimple ? 32 : 36);
- // time_low
- builder.append(digits(mostSigBits >> 32, 8));
- if (false == isSimple)
- {
- builder.append('-');
- }
- // time_mid
- builder.append(digits(mostSigBits >> 16, 4));
- if (false == isSimple)
- {
- builder.append('-');
- }
- // time_high_and_version
- builder.append(digits(mostSigBits, 4));
- if (false == isSimple)
- {
- builder.append('-');
- }
- // variant_and_sequence
- builder.append(digits(leastSigBits >> 48, 4));
- if (false == isSimple)
- {
- builder.append('-');
- }
- // node
- builder.append(digits(leastSigBits, 12));
-
- return builder.toString();
- }
-
- /**
- * 杩斿洖姝 UUID 鐨勫搱甯岀爜銆
- *
- * @return UUID 鐨勫搱甯岀爜鍊笺
- */
- public int hashCode()
- {
- long hilo = mostSigBits ^ leastSigBits;
- return ((int) (hilo >> 32)) ^ (int) hilo;
- }
-
- /**
- * 灏嗘瀵硅薄涓庢寚瀹氬璞℃瘮杈冦
- *
- * 褰撲笖浠呭綋鍙傛暟涓嶄负 {@code null}銆佽屾槸涓涓 UUID 瀵硅薄銆佸叿鏈変笌姝 UUID 鐩稿悓鐨 varriant銆佸寘鍚浉鍚岀殑鍊硷紙姣忎竴浣嶅潎鐩稿悓锛夋椂锛岀粨鏋滄墠涓 {@code true}銆
- *
- * @param obj 瑕佷笌涔嬫瘮杈冪殑瀵硅薄
- *
- * @return 濡傛灉瀵硅薄鐩稿悓锛屽垯杩斿洖 {@code true}锛涘惁鍒欒繑鍥 {@code false}
- */
- public boolean equals(Object obj)
- {
- if ((null == obj) || (obj.getClass() != UUID.class))
- {
- return false;
- }
- UUID id = (UUID) obj;
- return (mostSigBits == id.mostSigBits && leastSigBits == id.leastSigBits);
- }
-
- // Comparison Operations
-
- /**
- * 灏嗘 UUID 涓庢寚瀹氱殑 UUID 姣旇緝銆
- *
- *
- * 濡傛灉涓や釜 UUID 涓嶅悓锛屼笖绗竴涓 UUID 鐨勬渶楂樻湁鏁堝瓧娈靛ぇ浜庣浜屼釜 UUID 鐨勫搴斿瓧娈碉紝鍒欑涓涓 UUID 澶т簬绗簩涓 UUID銆
- *
- * @param val 涓庢 UUID 姣旇緝鐨 UUID
- *
- * @return 鍦ㄦ UUID 灏忎簬銆佺瓑浜庢垨澶т簬 val 鏃讹紝鍒嗗埆杩斿洖 -1銆0 鎴 1銆
- *
- */
- public int compareTo(UUID val)
- {
- // The ordering is intentionally set up so that the UUIDs
- // can simply be numerically compared as two numbers
- return (this.mostSigBits < val.mostSigBits ? -1 : //
- (this.mostSigBits > val.mostSigBits ? 1 : //
- (this.leastSigBits < val.leastSigBits ? -1 : //
- (this.leastSigBits > val.leastSigBits ? 1 : //
- 0))));
- }
-
- // -------------------------------------------------------------------------------------------------------------------
- // Private method start
- /**
- * 杩斿洖鎸囧畾鏁板瓧瀵瑰簲鐨刪ex鍊
- *
- * @param val 鍊
- * @param digits 浣
- * @return 鍊
- */
- private static String digits(long val, int digits)
- {
- long hi = 1L << (digits * 4);
- return Long.toHexString(hi | (val & (hi - 1))).substring(1);
- }
-
- /**
- * 妫鏌ユ槸鍚︿负time-based鐗堟湰UUID
- */
- private void checkTimeBase()
- {
- if (version() != 1)
- {
- throw new UnsupportedOperationException("Not a time-based UUID");
- }
- }
-
- /**
- * 鑾峰彇{@link SecureRandom}锛岀被鎻愪緵鍔犲瘑鐨勫己闅忔満鏁扮敓鎴愬櫒 (RNG)
- *
- * @return {@link SecureRandom}
- */
- public static SecureRandom getSecureRandom()
- {
- try
- {
- return SecureRandom.getInstance("SHA1PRNG");
- }
- catch (NoSuchAlgorithmException e)
- {
- throw new UtilException(e);
- }
- }
-
- /**
- * 鑾峰彇闅忔満鏁扮敓鎴愬櫒瀵硅薄
- * ThreadLocalRandom鏄疛DK 7涔嬪悗鎻愪緵骞跺彂浜х敓闅忔満鏁帮紝鑳藉瑙ｅ喅澶氫釜绾跨▼鍙戠敓鐨勭珵浜変簤澶恒
- *
- * @return {@link ThreadLocalRandom}
- */
- public static ThreadLocalRandom getRandom()
- {
- return ThreadLocalRandom.current();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/ruoyi/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
deleted file mode 100644
index 8297661a..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.ruoyi.common.core.text;
-
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * 瀛楃闆嗗伐鍏风被
- *
- * @author ruoyi
- */
-public class CharsetKit
-{
- /** ISO-8859-1 */
- public static final String ISO_8859_1 = "ISO-8859-1";
- /** UTF-8 */
- public static final String UTF_8 = "UTF-8";
- /** GBK */
- public static final String GBK = "GBK";
-
- /** ISO-8859-1 */
- public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
- /** UTF-8 */
- public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
- /** GBK */
- public static final Charset CHARSET_GBK = Charset.forName(GBK);
-
- /**
- * 杞崲涓篊harset瀵硅薄
- *
- * @param charset 瀛楃闆嗭紝涓虹┖鍒欒繑鍥為粯璁ゅ瓧绗﹂泦
- * @return Charset
- */
- public static Charset charset(String charset)
- {
- return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
- }
-
- /**
- * 杞崲瀛楃涓茬殑瀛楃闆嗙紪鐮
- *
- * @param source 瀛楃涓
- * @param srcCharset 婧愬瓧绗﹂泦锛岄粯璁SO-8859-1
- * @param destCharset 鐩爣瀛楃闆嗭紝榛樿UTF-8
- * @return 杞崲鍚庣殑瀛楃闆
- */
- public static String convert(String source, String srcCharset, String destCharset)
- {
- return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
- }
-
- /**
- * 杞崲瀛楃涓茬殑瀛楃闆嗙紪鐮
- *
- * @param source 瀛楃涓
- * @param srcCharset 婧愬瓧绗﹂泦锛岄粯璁SO-8859-1
- * @param destCharset 鐩爣瀛楃闆嗭紝榛樿UTF-8
- * @return 杞崲鍚庣殑瀛楃闆
- */
- public static String convert(String source, Charset srcCharset, Charset destCharset)
- {
- if (null == srcCharset)
- {
- srcCharset = StandardCharsets.ISO_8859_1;
- }
-
- if (null == destCharset)
- {
- srcCharset = StandardCharsets.UTF_8;
- }
-
- if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))
- {
- return source;
- }
- return new String(source.getBytes(srcCharset), destCharset);
- }
-
- /**
- * @return 绯荤粺瀛楃闆嗙紪鐮
- */
- public static String systemCharset()
- {
- return Charset.defaultCharset().name();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/text/Convert.java b/ruoyi/src/main/java/com/ruoyi/common/core/text/Convert.java
deleted file mode 100644
index 9dd076d0..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/core/text/Convert.java
+++ /dev/null
@@ -1,999 +0,0 @@
-package com.ruoyi.common.core.text;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.text.NumberFormat;
-import java.util.Set;
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * 绫诲瀷杞崲鍣
- *
- * @author ruoyi
- */
-public class Convert
-{
- /**
- * 杞崲涓哄瓧绗︿覆
- * 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static String toStr(Object value, String defaultValue)
- {
- if (null == value)
- {
- return defaultValue;
- }
- if (value instanceof String)
- {
- return (String) value;
- }
- return value.toString();
- }
-
- /**
- * 杞崲涓哄瓧绗︿覆
- * 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static String toStr(Object value)
- {
- return toStr(value, null);
- }
-
- /**
- * 杞崲涓哄瓧绗
- * 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static Character toChar(Object value, Character defaultValue)
- {
- if (null == value)
- {
- return defaultValue;
- }
- if (value instanceof Character)
- {
- return (Character) value;
- }
-
- final String valueStr = toStr(value, null);
- return StringUtils.isEmpty(valueStr) ? defaultValue : valueStr.charAt(0);
- }
-
- /**
- * 杞崲涓哄瓧绗
- * 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Character toChar(Object value)
- {
- return toChar(value, null);
- }
-
- /**
- * 杞崲涓篵yte
- * 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static Byte toByte(Object value, Byte defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (value instanceof Byte)
- {
- return (Byte) value;
- }
- if (value instanceof Number)
- {
- return ((Number) value).byteValue();
- }
- final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- try
- {
- return Byte.parseByte(valueStr);
- }
- catch (Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓篵yte
- * 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Byte toByte(Object value)
- {
- return toByte(value, null);
- }
-
- /**
- * 杞崲涓篠hort
- * 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static Short toShort(Object value, Short defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (value instanceof Short)
- {
- return (Short) value;
- }
- if (value instanceof Number)
- {
- return ((Number) value).shortValue();
- }
- final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- try
- {
- return Short.parseShort(valueStr.trim());
- }
- catch (Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓篠hort
- * 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Short toShort(Object value)
- {
- return toShort(value, null);
- }
-
- /**
- * 杞崲涓篘umber
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static Number toNumber(Object value, Number defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (value instanceof Number)
- {
- return (Number) value;
- }
- final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- try
- {
- return NumberFormat.getInstance().parse(valueStr);
- }
- catch (Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓篘umber
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Number toNumber(Object value)
- {
- return toNumber(value, null);
- }
-
- /**
- * 杞崲涓篿nt
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static Integer toInt(Object value, Integer defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (value instanceof Integer)
- {
- return (Integer) value;
- }
- if (value instanceof Number)
- {
- return ((Number) value).intValue();
- }
- final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- try
- {
- return Integer.parseInt(valueStr.trim());
- }
- catch (Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓篿nt
- * 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Integer toInt(Object value)
- {
- return toInt(value, null);
- }
-
- /**
- * 杞崲涓篒nteger鏁扮粍
- *
- * @param str 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Integer[] toIntArray(String str)
- {
- return toIntArray(",", str);
- }
-
- /**
- * 杞崲涓篖ong鏁扮粍
- *
- * @param str 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Long[] toLongArray(String str)
- {
- return toLongArray(",", str);
- }
-
- /**
- * 杞崲涓篒nteger鏁扮粍
- *
- * @param split 鍒嗛殧绗
- * @param split 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Integer[] toIntArray(String split, String str)
- {
- if (StringUtils.isEmpty(str))
- {
- return new Integer[] {};
- }
- String[] arr = str.split(split);
- final Integer[] ints = new Integer[arr.length];
- for (int i = 0; i < arr.length; i++)
- {
- final Integer v = toInt(arr[i], 0);
- ints[i] = v;
- }
- return ints;
- }
-
- /**
- * 杞崲涓篖ong鏁扮粍
- *
- * @param split 鍒嗛殧绗
- * @param str 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Long[] toLongArray(String split, String str)
- {
- if (StringUtils.isEmpty(str))
- {
- return new Long[] {};
- }
- String[] arr = str.split(split);
- final Long[] longs = new Long[arr.length];
- for (int i = 0; i < arr.length; i++)
- {
- final Long v = toLong(arr[i], null);
- longs[i] = v;
- }
- return longs;
- }
-
- /**
- * 杞崲涓篠tring鏁扮粍
- *
- * @param str 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static String[] toStrArray(String str)
- {
- return toStrArray(",", str);
- }
-
- /**
- * 杞崲涓篠tring鏁扮粍
- *
- * @param split 鍒嗛殧绗
- * @param split 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static String[] toStrArray(String split, String str)
- {
- return str.split(split);
- }
-
- /**
- * 杞崲涓簂ong
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static Long toLong(Object value, Long defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (value instanceof Long)
- {
- return (Long) value;
- }
- if (value instanceof Number)
- {
- return ((Number) value).longValue();
- }
- final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- try
- {
- // 鏀寔绉戝璁℃暟娉
- return new BigDecimal(valueStr.trim()).longValue();
- }
- catch (Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓簂ong
- * 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Long toLong(Object value)
- {
- return toLong(value, null);
- }
-
- /**
- * 杞崲涓篸ouble
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static Double toDouble(Object value, Double defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (value instanceof Double)
- {
- return (Double) value;
- }
- if (value instanceof Number)
- {
- return ((Number) value).doubleValue();
- }
- final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- try
- {
- // 鏀寔绉戝璁℃暟娉
- return new BigDecimal(valueStr.trim()).doubleValue();
- }
- catch (Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓篸ouble
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Double toDouble(Object value)
- {
- return toDouble(value, null);
- }
-
- /**
- * 杞崲涓篎loat
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static Float toFloat(Object value, Float defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (value instanceof Float)
- {
- return (Float) value;
- }
- if (value instanceof Number)
- {
- return ((Number) value).floatValue();
- }
- final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- try
- {
- return Float.parseFloat(valueStr.trim());
- }
- catch (Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓篎loat
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Float toFloat(Object value)
- {
- return toFloat(value, null);
- }
-
- /**
- * 杞崲涓篵oolean
- * String鏀寔鐨勫间负锛歵rue銆乫alse銆亂es銆乷k銆乶o锛1,0 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static Boolean toBool(Object value, Boolean defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (value instanceof Boolean)
- {
- return (Boolean) value;
- }
- String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- valueStr = valueStr.trim().toLowerCase();
- switch (valueStr)
- {
- case "true":
- return true;
- case "false":
- return false;
- case "yes":
- return true;
- case "ok":
- return true;
- case "no":
- return false;
- case "1":
- return true;
- case "0":
- return false;
- default:
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓篵oolean
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Boolean toBool(Object value)
- {
- return toBool(value, null);
- }
-
- /**
- * 杞崲涓篍num瀵硅薄
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- *
- * @param clazz Enum鐨凜lass
- * @param value 鍊
- * @param defaultValue 榛樿鍊
- * @return Enum
- */
- public static > E toEnum(Class clazz, Object value, E defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (clazz.isAssignableFrom(value.getClass()))
- {
- @SuppressWarnings("unchecked")
- E myE = (E) value;
- return myE;
- }
- final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- try
- {
- return Enum.valueOf(clazz, valueStr);
- }
- catch (Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓篍num瀵硅薄
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- *
- * @param clazz Enum鐨凜lass
- * @param value 鍊
- * @return Enum
- */
- public static > E toEnum(Class clazz, Object value)
- {
- return toEnum(clazz, value, null);
- }
-
- /**
- * 杞崲涓築igInteger
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static BigInteger toBigInteger(Object value, BigInteger defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (value instanceof BigInteger)
- {
- return (BigInteger) value;
- }
- if (value instanceof Long)
- {
- return BigInteger.valueOf((Long) value);
- }
- final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- try
- {
- return new BigInteger(valueStr);
- }
- catch (Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓築igInteger
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static BigInteger toBigInteger(Object value)
- {
- return toBigInteger(value, null);
- }
-
- /**
- * 杞崲涓築igDecimal
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (value instanceof BigDecimal)
- {
- return (BigDecimal) value;
- }
- if (value instanceof Long)
- {
- return new BigDecimal((Long) value);
- }
- if (value instanceof Double)
- {
- return new BigDecimal((Double) value);
- }
- if (value instanceof Integer)
- {
- return new BigDecimal((Integer) value);
- }
- final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- try
- {
- return new BigDecimal(valueStr);
- }
- catch (Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓築igDecimal
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static BigDecimal toBigDecimal(Object value)
- {
- return toBigDecimal(value, null);
- }
-
- /**
- * 灏嗗璞¤浆涓哄瓧绗︿覆
- * 1銆丅yte鏁扮粍鍜孊yteBuffer浼氳杞崲涓哄搴斿瓧绗︿覆鐨勬暟缁 2銆佸璞℃暟缁勪細璋冪敤Arrays.toString鏂规硶
- *
- * @param obj 瀵硅薄
- * @return 瀛楃涓
- */
- public static String utf8Str(Object obj)
- {
- return str(obj, CharsetKit.CHARSET_UTF_8);
- }
-
- /**
- * 灏嗗璞¤浆涓哄瓧绗︿覆
- * 1銆丅yte鏁扮粍鍜孊yteBuffer浼氳杞崲涓哄搴斿瓧绗︿覆鐨勬暟缁 2銆佸璞℃暟缁勪細璋冪敤Arrays.toString鏂规硶
- *
- * @param obj 瀵硅薄
- * @param charsetName 瀛楃闆
- * @return 瀛楃涓
- */
- public static String str(Object obj, String charsetName)
- {
- return str(obj, Charset.forName(charsetName));
- }
-
- /**
- * 灏嗗璞¤浆涓哄瓧绗︿覆
- * 1銆丅yte鏁扮粍鍜孊yteBuffer浼氳杞崲涓哄搴斿瓧绗︿覆鐨勬暟缁 2銆佸璞℃暟缁勪細璋冪敤Arrays.toString鏂规硶
- *
- * @param obj 瀵硅薄
- * @param charset 瀛楃闆
- * @return 瀛楃涓
- */
- public static String str(Object obj, Charset charset)
- {
- if (null == obj)
- {
- return null;
- }
-
- if (obj instanceof String)
- {
- return (String) obj;
- }
- else if (obj instanceof byte[] || obj instanceof Byte[])
- {
- return str((Byte[]) obj, charset);
- }
- else if (obj instanceof ByteBuffer)
- {
- return str((ByteBuffer) obj, charset);
- }
- return obj.toString();
- }
-
- /**
- * 灏哹yte鏁扮粍杞负瀛楃涓
- *
- * @param bytes byte鏁扮粍
- * @param charset 瀛楃闆
- * @return 瀛楃涓
- */
- public static String str(byte[] bytes, String charset)
- {
- return str(bytes, StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset));
- }
-
- /**
- * 瑙ｇ爜瀛楄妭鐮
- *
- * @param data 瀛楃涓
- * @param charset 瀛楃闆嗭紝濡傛灉姝ゅ瓧娈典负绌猴紝鍒欒В鐮佺殑缁撴灉鍙栧喅浜庡钩鍙
- * @return 瑙ｇ爜鍚庣殑瀛楃涓
- */
- public static String str(byte[] data, Charset charset)
- {
- if (data == null)
- {
- return null;
- }
-
- if (null == charset)
- {
- return new String(data);
- }
- return new String(data, charset);
- }
-
- /**
- * 灏嗙紪鐮佺殑byteBuffer鏁版嵁杞崲涓哄瓧绗︿覆
- *
- * @param data 鏁版嵁
- * @param charset 瀛楃闆嗭紝濡傛灉涓虹┖浣跨敤褰撳墠绯荤粺瀛楃闆
- * @return 瀛楃涓
- */
- public static String str(ByteBuffer data, String charset)
- {
- if (data == null)
- {
- return null;
- }
-
- return str(data, Charset.forName(charset));
- }
-
- /**
- * 灏嗙紪鐮佺殑byteBuffer鏁版嵁杞崲涓哄瓧绗︿覆
- *
- * @param data 鏁版嵁
- * @param charset 瀛楃闆嗭紝濡傛灉涓虹┖浣跨敤褰撳墠绯荤粺瀛楃闆
- * @return 瀛楃涓
- */
- public static String str(ByteBuffer data, Charset charset)
- {
- if (null == charset)
- {
- charset = Charset.defaultCharset();
- }
- return charset.decode(data).toString();
- }
-
- // ----------------------------------------------------------------------- 鍏ㄨ鍗婅杞崲
- /**
- * 鍗婅杞叏瑙
- *
- * @param input String.
- * @return 鍏ㄨ瀛楃涓.
- */
- public static String toSBC(String input)
- {
- return toSBC(input, null);
- }
-
- /**
- * 鍗婅杞叏瑙
- *
- * @param input String
- * @param notConvertSet 涓嶆浛鎹㈢殑瀛楃闆嗗悎
- * @return 鍏ㄨ瀛楃涓.
- */
- public static String toSBC(String input, Set notConvertSet)
- {
- char c[] = input.toCharArray();
- for (int i = 0; i < c.length; i++)
- {
- if (null != notConvertSet && notConvertSet.contains(c[i]))
- {
- // 璺宠繃涓嶆浛鎹㈢殑瀛楃
- continue;
- }
-
- if (c[i] == ' ')
- {
- c[i] = '\u3000';
- }
- else if (c[i] < '\177')
- {
- c[i] = (char) (c[i] + 65248);
-
- }
- }
- return new String(c);
- }
-
- /**
- * 鍏ㄨ杞崐瑙
- *
- * @param input String.
- * @return 鍗婅瀛楃涓
- */
- public static String toDBC(String input)
- {
- return toDBC(input, null);
- }
-
- /**
- * 鏇挎崲鍏ㄨ涓哄崐瑙
- *
- * @param text 鏂囨湰
- * @param notConvertSet 涓嶆浛鎹㈢殑瀛楃闆嗗悎
- * @return 鏇挎崲鍚庣殑瀛楃
- */
- public static String toDBC(String text, Set notConvertSet)
- {
- char c[] = text.toCharArray();
- for (int i = 0; i < c.length; i++)
- {
- if (null != notConvertSet && notConvertSet.contains(c[i]))
- {
- // 璺宠繃涓嶆浛鎹㈢殑瀛楃
- continue;
- }
-
- if (c[i] == '\u3000')
- {
- c[i] = ' ';
- }
- else if (c[i] > '\uFF00' && c[i] < '\uFF5F')
- {
- c[i] = (char) (c[i] - 65248);
- }
- }
- String returnString = new String(c);
-
- return returnString;
- }
-
- /**
- * 鏁板瓧閲戦澶у啓杞崲 鍏堝啓涓畬鏁寸殑鐒跺悗灏嗗闆舵嬀鏇挎崲鎴愰浂
- *
- * @param n 鏁板瓧
- * @return 涓枃澶у啓鏁板瓧
- */
- public static String digitUppercase(double n)
- {
- String[] fraction = { "瑙", "鍒" };
- String[] digit = { "闆", "澹", "璐", "鍙", "鑲", "浼", "闄", "鏌", "鎹", "鐜" };
- String[][] unit = { { "鍏", "涓", "浜" }, { "", "鎷", "浣", "浠" } };
-
- String head = n < 0 ? "璐" : "";
- n = Math.abs(n);
-
- String s = "";
- for (int i = 0; i < fraction.length; i++)
- {
- s += (digit[(int) (Math.floor(n * 10 * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(闆.)+", "");
- }
- if (s.length() < 1)
- {
- s = "鏁";
- }
- int integerPart = (int) Math.floor(n);
-
- for (int i = 0; i < unit[0].length && integerPart > 0; i++)
- {
- String p = "";
- for (int j = 0; j < unit[1].length && n > 0; j++)
- {
- p = digit[integerPart % 10] + unit[1][j] + p;
- integerPart = integerPart / 10;
- }
- s = p.replaceAll("(闆.)*闆$", "").replaceAll("^$", "闆") + unit[0][i] + s;
- }
- return head + s.replaceAll("(闆.)*闆跺厓", "鍏").replaceFirst("(闆.)+", "").replaceAll("(闆.)+", "闆").replaceAll("^鏁$", "闆跺厓鏁");
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/text/StrFormatter.java b/ruoyi/src/main/java/com/ruoyi/common/core/text/StrFormatter.java
deleted file mode 100644
index dbf3e237..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/core/text/StrFormatter.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.ruoyi.common.core.text;
-
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * 瀛楃涓叉牸寮忓寲
- *
- * @author ruoyi
- */
-public class StrFormatter
-{
- public static final String EMPTY_JSON = "{}";
- public static final char C_BACKSLASH = '\\';
- public static final char C_DELIM_START = '{';
- public static final char C_DELIM_END = '}';
-
- /**
- * 鏍煎紡鍖栧瓧绗︿覆
- * 姝ゆ柟娉曞彧鏄畝鍗曞皢鍗犱綅绗 {} 鎸夌収椤哄簭鏇挎崲涓哄弬鏁
- * 濡傛灉鎯宠緭鍑 {} 浣跨敤 \\杞箟 { 鍗冲彲锛屽鏋滄兂杈撳嚭 {} 涔嬪墠鐨 \ 浣跨敤鍙岃浆涔夌 \\\\ 鍗冲彲
- * 渚嬶細
- * 閫氬父浣跨敤锛歠ormat("this is {} for {}", "a", "b") -> this is a for b
- * 杞箟{}锛 format("this is \\{} for {}", "a", "b") -> this is \{} for a
- * 杞箟\锛 format("this is \\\\{} for {}", "a", "b") -> this is \a for b
- *
- * @param strPattern 瀛楃涓叉ā鏉
- * @param argArray 鍙傛暟鍒楄〃
- * @return 缁撴灉
- */
- public static String format(final String strPattern, final Object... argArray)
- {
- if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray))
- {
- return strPattern;
- }
- final int strPatternLength = strPattern.length();
-
- // 鍒濆鍖栧畾涔夊ソ鐨勯暱搴︿互鑾峰緱鏇村ソ鐨勬ц兘
- StringBuilder sbuf = new StringBuilder(strPatternLength + 50);
-
- int handledPosition = 0;
- int delimIndex;// 鍗犱綅绗︽墍鍦ㄤ綅缃
- for (int argIndex = 0; argIndex < argArray.length; argIndex++)
- {
- delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition);
- if (delimIndex == -1)
- {
- if (handledPosition == 0)
- {
- return strPattern;
- }
- else
- { // 瀛楃涓叉ā鏉垮墿浣欓儴鍒嗕笉鍐嶅寘鍚崰浣嶇锛屽姞鍏ュ墿浣欓儴鍒嗗悗杩斿洖缁撴灉
- sbuf.append(strPattern, handledPosition, strPatternLength);
- return sbuf.toString();
- }
- }
- else
- {
- if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH)
- {
- if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH)
- {
- // 杞箟绗︿箣鍓嶈繕鏈変竴涓浆涔夌锛屽崰浣嶇渚濇棫鏈夋晥
- sbuf.append(strPattern, handledPosition, delimIndex - 1);
- sbuf.append(Convert.utf8Str(argArray[argIndex]));
- handledPosition = delimIndex + 2;
- }
- else
- {
- // 鍗犱綅绗﹁杞箟
- argIndex--;
- sbuf.append(strPattern, handledPosition, delimIndex - 1);
- sbuf.append(C_DELIM_START);
- handledPosition = delimIndex + 1;
- }
- }
- else
- {
- // 姝ｅ父鍗犱綅绗
- sbuf.append(strPattern, handledPosition, delimIndex);
- sbuf.append(Convert.utf8Str(argArray[argIndex]));
- handledPosition = delimIndex + 2;
- }
- }
- }
- // 鍔犲叆鏈鍚庝竴涓崰浣嶇鍚庢墍鏈夌殑瀛楃
- sbuf.append(strPattern, handledPosition, strPattern.length());
-
- return sbuf.toString();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/enums/HttpMethod.java b/ruoyi/src/main/java/com/ruoyi/common/enums/HttpMethod.java
deleted file mode 100644
index 2fa9f867..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/enums/HttpMethod.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.ruoyi.common.enums;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.springframework.lang.Nullable;
-
-/**
- * 璇锋眰鏂瑰紡
- *
- * @author ruoyi
- */
-public enum HttpMethod
-{
- GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE;
-
- private static final Map mappings = new HashMap<>(16);
-
- static
- {
- for (HttpMethod httpMethod : values())
- {
- mappings.put(httpMethod.name(), httpMethod);
- }
- }
-
- @Nullable
- public static HttpMethod resolve(@Nullable String method)
- {
- return (method != null ? mappings.get(method) : null);
- }
-
- public boolean matches(String method)
- {
- return (this == resolve(method));
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/enums/UserStatus.java b/ruoyi/src/main/java/com/ruoyi/common/enums/UserStatus.java
deleted file mode 100644
index a4613ff9..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/enums/UserStatus.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.ruoyi.common.enums;
-
-/**
- * 鐢ㄦ埛鐘舵
- *
- * @author ruoyi
- */
-public enum UserStatus
-{
- OK("0", "姝ｅ父"), DISABLE("1", "鍋滅敤"), DELETED("2", "鍒犻櫎");
-
- private final String code;
- private final String info;
-
- UserStatus(String code, String info)
- {
- this.code = code;
- this.info = info;
- }
-
- public String getCode()
- {
- return code;
- }
-
- public String getInfo()
- {
- return info;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/exception/BaseException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/BaseException.java
deleted file mode 100644
index c1e55c17..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/exception/BaseException.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.ruoyi.common.exception;
-
-import com.ruoyi.common.utils.MessageUtils;
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * 鍩虹寮傚父
- *
- * @author ruoyi
- */
-public class BaseException extends RuntimeException
-{
- private static final long serialVersionUID = 1L;
-
- /**
- * 鎵灞炴ā鍧
- */
- private String module;
-
- /**
- * 閿欒鐮
- */
- private String code;
-
- /**
- * 閿欒鐮佸搴旂殑鍙傛暟
- */
- private Object[] args;
-
- /**
- * 閿欒娑堟伅
- */
- private String defaultMessage;
-
- public BaseException(String module, String code, Object[] args, String defaultMessage)
- {
- this.module = module;
- this.code = code;
- this.args = args;
- this.defaultMessage = defaultMessage;
- }
-
- public BaseException(String module, String code, Object[] args)
- {
- this(module, code, args, null);
- }
-
- public BaseException(String module, String defaultMessage)
- {
- this(module, null, null, defaultMessage);
- }
-
- public BaseException(String code, Object[] args)
- {
- this(null, code, args, null);
- }
-
- public BaseException(String defaultMessage)
- {
- this(null, null, null, defaultMessage);
- }
-
- @Override
- public String getMessage()
- {
- String message = null;
- if (!StringUtils.isEmpty(code))
- {
- message = MessageUtils.message(code, args);
- }
- if (message == null)
- {
- message = defaultMessage;
- }
- return message;
- }
-
- public String getModule()
- {
- return module;
- }
-
- public String getCode()
- {
- return code;
- }
-
- public Object[] getArgs()
- {
- return args;
- }
-
- public String getDefaultMessage()
- {
- return defaultMessage;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/exception/CustomException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/CustomException.java
deleted file mode 100644
index a99a1001..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/exception/CustomException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.ruoyi.common.exception;
-
-/**
- * 鑷畾涔夊紓甯
- *
- * @author ruoyi
- */
-public class CustomException extends RuntimeException
-{
- private static final long serialVersionUID = 1L;
-
- private Integer code;
-
- private String message;
-
- public CustomException(String message)
- {
- this.message = message;
- }
-
- public CustomException(String message, Integer code)
- {
- this.message = message;
- this.code = code;
- }
-
- public CustomException(String message, Throwable e)
- {
- super(message, e);
- this.message = message;
- }
-
- @Override
- public String getMessage()
- {
- return message;
- }
-
- public Integer getCode()
- {
- return code;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/exception/DemoModeException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/DemoModeException.java
deleted file mode 100644
index 57bffc47..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/exception/DemoModeException.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.ruoyi.common.exception;
-
-/**
- * 婕旂ず妯″紡寮傚父
- *
- * @author ruoyi
- */
-public class DemoModeException extends RuntimeException
-{
- private static final long serialVersionUID = 1L;
-
- public DemoModeException()
- {
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/exception/UtilException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/UtilException.java
deleted file mode 100644
index a544fb64..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/exception/UtilException.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.ruoyi.common.exception;
-
-/**
- * 宸ュ叿绫诲紓甯
- *
- * @author ruoyi
- */
-public class UtilException extends RuntimeException
-{
- private static final long serialVersionUID = 8247610319171014183L;
-
- public UtilException(Throwable e)
- {
- super(e.getMessage(), e);
- }
-
- public UtilException(String message)
- {
- super(message);
- }
-
- public UtilException(String message, Throwable throwable)
- {
- super(message, throwable);
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/exception/file/FileException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/file/FileException.java
deleted file mode 100644
index f0ae563a..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/exception/file/FileException.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.common.exception.file;
-
-import com.ruoyi.common.exception.BaseException;
-
-/**
- * 鏂囦欢淇℃伅寮傚父绫
- *
- * @author ruoyi
- */
-public class FileException extends BaseException
-{
- private static final long serialVersionUID = 1L;
-
- public FileException(String code, Object[] args)
- {
- super("file", code, args, null);
- }
-
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java
deleted file mode 100644
index 44941b8b..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.common.exception.file;
-
-/**
- * 鏂囦欢鍚嶇О瓒呴暱闄愬埗寮傚父绫
- *
- * @author ruoyi
- */
-public class FileNameLengthLimitExceededException extends FileException
-{
- private static final long serialVersionUID = 1L;
-
- public FileNameLengthLimitExceededException(int defaultFileNameLength)
- {
- super("upload.filename.exceed.length", new Object[] { defaultFileNameLength });
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java
deleted file mode 100644
index f855e72f..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.common.exception.file;
-
-/**
- * 鏂囦欢鍚嶅ぇ灏忛檺鍒跺紓甯哥被
- *
- * @author ruoyi
- */
-public class FileSizeLimitExceededException extends FileException
-{
- private static final long serialVersionUID = 1L;
-
- public FileSizeLimitExceededException(long defaultMaxSize)
- {
- super("upload.exceed.maxSize", new Object[] { defaultMaxSize });
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
deleted file mode 100644
index 81cd78b8..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.ruoyi.common.exception.file;
-
-import java.util.Arrays;
-import org.apache.commons.fileupload.FileUploadException;
-
-/**
- * 鏂囦欢涓婁紶 璇紓甯哥被
- *
- * @author ruoyi
- */
-public class InvalidExtensionException extends FileUploadException
-{
- private static final long serialVersionUID = 1L;
-
- private String[] allowedExtension;
- private String extension;
- private String filename;
-
- public InvalidExtensionException(String[] allowedExtension, String extension, String filename)
- {
- super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]");
- this.allowedExtension = allowedExtension;
- this.extension = extension;
- this.filename = filename;
- }
-
- public String[] getAllowedExtension()
- {
- return allowedExtension;
- }
-
- public String getExtension()
- {
- return extension;
- }
-
- public String getFilename()
- {
- return filename;
- }
-
- public static class InvalidImageExtensionException extends InvalidExtensionException
- {
- private static final long serialVersionUID = 1L;
-
- public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename)
- {
- super(allowedExtension, extension, filename);
- }
- }
-
- public static class InvalidFlashExtensionException extends InvalidExtensionException
- {
- private static final long serialVersionUID = 1L;
-
- public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename)
- {
- super(allowedExtension, extension, filename);
- }
- }
-
- public static class InvalidMediaExtensionException extends InvalidExtensionException
- {
- private static final long serialVersionUID = 1L;
-
- public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename)
- {
- super(allowedExtension, extension, filename);
- }
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java
deleted file mode 100644
index e3334ae3..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.common.exception.user;
-
-/**
- * 楠岃瘉鐮侀敊璇紓甯哥被
- *
- * @author ruoyi
- */
-public class CaptchaException extends UserException
-{
- private static final long serialVersionUID = 1L;
-
- public CaptchaException()
- {
- super("user.jcaptcha.error", null);
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java
deleted file mode 100644
index 5e6fd0f7..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.common.exception.user;
-
-/**
- * 楠岃瘉鐮佸け鏁堝紓甯哥被
- *
- * @author ruoyi
- */
-public class CaptchaExpireException extends UserException
-{
- private static final long serialVersionUID = 1L;
-
- public CaptchaExpireException()
- {
- super("user.jcaptcha.expire", null);
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/exception/user/UserException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/user/UserException.java
deleted file mode 100644
index b85dab6d..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/exception/user/UserException.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.ruoyi.common.exception.user;
-
-import com.ruoyi.common.exception.BaseException;
-
-/**
- * 鐢ㄦ埛淇℃伅寮傚父绫
- *
- * @author ruoyi
- */
-public class UserException extends BaseException
-{
- private static final long serialVersionUID = 1L;
-
- public UserException(String code, Object[] args)
- {
- super("user", code, args, null);
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java
deleted file mode 100644
index 71449e29..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.common.exception.user;
-
-/**
- * 鐢ㄦ埛瀵嗙爜涓嶆纭垨涓嶇鍚堣鑼冨紓甯哥被
- *
- * @author ruoyi
- */
-public class UserPasswordNotMatchException extends UserException
-{
- private static final long serialVersionUID = 1L;
-
- public UserPasswordNotMatchException()
- {
- super("user.password.not.match", null);
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/Arith.java b/ruoyi/src/main/java/com/ruoyi/common/utils/Arith.java
deleted file mode 100644
index 86683197..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/Arith.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.ruoyi.common.utils;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-
-/**
- * 绮剧‘鐨勬诞鐐规暟杩愮畻
- *
- * @author ruoyi
- */
-public class Arith
-{
-
- /** 榛樿闄ゆ硶杩愮畻绮惧害 */
- private static final int DEF_DIV_SCALE = 10;
-
- /** 杩欎釜绫讳笉鑳藉疄渚嬪寲 */
- private Arith()
- {
- }
-
- /**
- * 鎻愪緵绮剧‘鐨勫姞娉曡繍绠椼
- * @param v1 琚姞鏁
- * @param v2 鍔犳暟
- * @return 涓や釜鍙傛暟鐨勫拰
- */
- public static double add(double v1, double v2)
- {
- BigDecimal b1 = new BigDecimal(Double.toString(v1));
- BigDecimal b2 = new BigDecimal(Double.toString(v2));
- return b1.add(b2).doubleValue();
- }
-
- /**
- * 鎻愪緵绮剧‘鐨勫噺娉曡繍绠椼
- * @param v1 琚噺鏁
- * @param v2 鍑忔暟
- * @return 涓や釜鍙傛暟鐨勫樊
- */
- public static double sub(double v1, double v2)
- {
- BigDecimal b1 = new BigDecimal(Double.toString(v1));
- BigDecimal b2 = new BigDecimal(Double.toString(v2));
- return b1.subtract(b2).doubleValue();
- }
-
- /**
- * 鎻愪緵绮剧‘鐨勪箻娉曡繍绠椼
- * @param v1 琚箻鏁
- * @param v2 涔樻暟
- * @return 涓や釜鍙傛暟鐨勭Н
- */
- public static double mul(double v1, double v2)
- {
- BigDecimal b1 = new BigDecimal(Double.toString(v1));
- BigDecimal b2 = new BigDecimal(Double.toString(v2));
- return b1.multiply(b2).doubleValue();
- }
-
- /**
- * 鎻愪緵锛堢浉瀵癸級绮剧‘鐨勯櫎娉曡繍绠楋紝褰撳彂鐢熼櫎涓嶅敖鐨勬儏鍐垫椂锛岀簿纭埌
- * 灏忔暟鐐逛互鍚10浣嶏紝浠ュ悗鐨勬暟瀛楀洓鑸嶄簲鍏ャ
- * @param v1 琚櫎鏁
- * @param v2 闄ゆ暟
- * @return 涓や釜鍙傛暟鐨勫晢
- */
- public static double div(double v1, double v2)
- {
- return div(v1, v2, DEF_DIV_SCALE);
- }
-
- /**
- * 鎻愪緵锛堢浉瀵癸級绮剧‘鐨勯櫎娉曡繍绠椼傚綋鍙戠敓闄や笉灏界殑鎯呭喌鏃讹紝鐢眘cale鍙傛暟鎸
- * 瀹氱簿搴︼紝浠ュ悗鐨勬暟瀛楀洓鑸嶄簲鍏ャ
- * @param v1 琚櫎鏁
- * @param v2 闄ゆ暟
- * @param scale 琛ㄧず琛ㄧず闇瑕佺簿纭埌灏忔暟鐐逛互鍚庡嚑浣嶃
- * @return 涓や釜鍙傛暟鐨勫晢
- */
- public static double div(double v1, double v2, int scale)
- {
- if (scale < 0)
- {
- throw new IllegalArgumentException(
- "The scale must be a positive integer or zero");
- }
- BigDecimal b1 = new BigDecimal(Double.toString(v1));
- BigDecimal b2 = new BigDecimal(Double.toString(v2));
- if (b1.compareTo(BigDecimal.ZERO) == 0)
- {
- return BigDecimal.ZERO.doubleValue();
- }
- return b1.divide(b2, scale, RoundingMode.HALF_UP).doubleValue();
- }
-
- /**
- * 鎻愪緵绮剧‘鐨勫皬鏁颁綅鍥涜垗浜斿叆澶勭悊銆
- * @param v 闇瑕佸洓鑸嶄簲鍏ョ殑鏁板瓧
- * @param scale 灏忔暟鐐瑰悗淇濈暀鍑犱綅
- * @return 鍥涜垗浜斿叆鍚庣殑缁撴灉
- */
- public static double round(double v, int scale)
- {
- if (scale < 0)
- {
- throw new IllegalArgumentException(
- "The scale must be a positive integer or zero");
- }
- BigDecimal b = new BigDecimal(Double.toString(v));
- BigDecimal one = new BigDecimal("1");
- return b.divide(one, scale, RoundingMode.HALF_UP).doubleValue();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/DateUtils.java
deleted file mode 100644
index 8ff95f1b..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.ruoyi.common.utils;
-
-import java.lang.management.ManagementFactory;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.apache.commons.lang3.time.DateFormatUtils;
-
-/**
- * 鏃堕棿宸ュ叿绫
- *
- * @author ruoyi
- */
-public class DateUtils extends org.apache.commons.lang3.time.DateUtils
-{
- public static String YYYY = "yyyy";
-
- public static String YYYY_MM = "yyyy-MM";
-
- public static String YYYY_MM_DD = "yyyy-MM-dd";
-
- public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
-
- public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
-
- private static String[] parsePatterns = {
- "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
- "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
- "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
-
- /**
- * 鑾峰彇褰撳墠Date鍨嬫棩鏈
- *
- * @return Date() 褰撳墠鏃ユ湡
- */
- public static Date getNowDate()
- {
- return new Date();
- }
-
- /**
- * 鑾峰彇褰撳墠鏃ユ湡, 榛樿鏍煎紡涓簓yyy-MM-dd
- *
- * @return String
- */
- public static String getDate()
- {
- return dateTimeNow(YYYY_MM_DD);
- }
-
- public static final String getTime()
- {
- return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
- }
-
- public static final String dateTimeNow()
- {
- return dateTimeNow(YYYYMMDDHHMMSS);
- }
-
- public static final String dateTimeNow(final String format)
- {
- return parseDateToStr(format, new Date());
- }
-
- public static final String dateTime(final Date date)
- {
- return parseDateToStr(YYYY_MM_DD, date);
- }
-
- public static final String parseDateToStr(final String format, final Date date)
- {
- return new SimpleDateFormat(format).format(date);
- }
-
- public static final Date dateTime(final String format, final String ts)
- {
- try
- {
- return new SimpleDateFormat(format).parse(ts);
- }
- catch (ParseException e)
- {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * 鏃ユ湡璺緞 鍗冲勾/鏈/鏃 濡2018/08/08
- */
- public static final String datePath()
- {
- Date now = new Date();
- return DateFormatUtils.format(now, "yyyy/MM/dd");
- }
-
- /**
- * 鏃ユ湡璺緞 鍗冲勾/鏈/鏃 濡20180808
- */
- public static final String dateTime()
- {
- Date now = new Date();
- return DateFormatUtils.format(now, "yyyyMMdd");
- }
-
- /**
- * 鏃ユ湡鍨嬪瓧绗︿覆杞寲涓烘棩鏈 鏍煎紡
- */
- public static Date parseDate(Object str)
- {
- if (str == null)
- {
- return null;
- }
- try
- {
- return parseDate(str.toString(), parsePatterns);
- }
- catch (ParseException e)
- {
- return null;
- }
- }
-
- /**
- * 鑾峰彇鏈嶅姟鍣ㄥ惎鍔ㄦ椂闂
- */
- public static Date getServerStartDate()
- {
- long time = ManagementFactory.getRuntimeMXBean().getStartTime();
- return new Date(time);
- }
-
- /**
- * 璁＄畻涓や釜鏃堕棿宸
- */
- public static String getDatePoor(Date endDate, Date nowDate)
- {
- long nd = 1000 * 24 * 60 * 60;
- long nh = 1000 * 60 * 60;
- long nm = 1000 * 60;
- // long ns = 1000;
- // 鑾峰緱涓や釜鏃堕棿鐨勬绉掓椂闂村樊寮
- long diff = endDate.getTime() - nowDate.getTime();
- // 璁＄畻宸灏戝ぉ
- long day = diff / nd;
- // 璁＄畻宸灏戝皬鏃
- long hour = diff % nd / nh;
- // 璁＄畻宸灏戝垎閽
- long min = diff % nd % nh / nm;
- // 璁＄畻宸灏戠//杈撳嚭缁撴灉
- // long sec = diff % nd % nh % nm / ns;
- return day + "澶" + hour + "灏忔椂" + min + "鍒嗛挓";
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/IdUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/IdUtils.java
deleted file mode 100644
index 45d8ac91..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/IdUtils.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.ruoyi.common.utils;
-
-import com.ruoyi.common.core.lang.UUID;
-
-/**
- * ID鐢熸垚鍣ㄥ伐鍏风被
- *
- * @author ruoyi
- */
-public class IdUtils
-{
- /**
- * 鑾峰彇闅忔満UUID
- *
- * @return 闅忔満UUID
- */
- public static String randomUUID()
- {
- return UUID.randomUUID().toString();
- }
-
- /**
- * 绠鍖栫殑UUID锛屽幓鎺変簡妯嚎
- *
- * @return 绠鍖栫殑UUID锛屽幓鎺変簡妯嚎
- */
- public static String simpleUUID()
- {
- return UUID.randomUUID().toString(true);
- }
-
- /**
- * 鑾峰彇闅忔満UUID锛屼娇鐢ㄦц兘鏇村ソ鐨凾hreadLocalRandom鐢熸垚UUID
- *
- * @return 闅忔満UUID
- */
- public static String fastUUID()
- {
- return UUID.fastUUID().toString();
- }
-
- /**
- * 绠鍖栫殑UUID锛屽幓鎺変簡妯嚎锛屼娇鐢ㄦц兘鏇村ソ鐨凾hreadLocalRandom鐢熸垚UUID
- *
- * @return 绠鍖栫殑UUID锛屽幓鎺変簡妯嚎
- */
- public static String fastSimpleUUID()
- {
- return UUID.fastUUID().toString(true);
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/LogUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/LogUtils.java
deleted file mode 100644
index e415c9c3..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/LogUtils.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.ruoyi.common.utils;
-
-/**
- * 澶勭悊骞惰褰曟棩蹇楁枃浠
- *
- * @author ruoyi
- */
-public class LogUtils
-{
- public static String getBlock(Object msg)
- {
- if (msg == null)
- {
- msg = "";
- }
- return "[" + msg.toString() + "]";
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/MessageUtils.java
deleted file mode 100644
index 5f2d9ea2..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/MessageUtils.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.ruoyi.common.utils;
-
-import org.springframework.context.MessageSource;
-import org.springframework.context.i18n.LocaleContextHolder;
-import com.ruoyi.common.utils.spring.SpringUtils;
-
-/**
- * 鑾峰彇i18n璧勬簮鏂囦欢
- *
- * @author ruoyi
- */
-public class MessageUtils
-{
- /**
- * 鏍规嵁娑堟伅閿拰鍙傛暟 鑾峰彇娑堟伅 濮旀墭缁檚pring messageSource
- *
- * @param code 娑堟伅閿
- * @param args 鍙傛暟
- * @return 鑾峰彇鍥介檯鍖栫炕璇戝
- */
- public static String message(String code, Object... args)
- {
- MessageSource messageSource = SpringUtils.getBean(MessageSource.class);
- return messageSource.getMessage(code, args, LocaleContextHolder.getLocale());
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
deleted file mode 100644
index c8d1783e..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.ruoyi.common.utils;
-
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.exception.CustomException;
-import com.ruoyi.framework.security.LoginUser;
-
-/**
- * 瀹夊叏鏈嶅姟宸ュ叿绫
- *
- * @author ruoyi
- */
-public class SecurityUtils
-{
- /**
- * 鑾峰彇鐢ㄦ埛璐︽埛
- **/
- public static String getUsername()
- {
- try
- {
- return getLoginUser().getUsername();
- }
- catch (Exception e)
- {
- throw new CustomException("鑾峰彇鐢ㄦ埛璐︽埛寮傚父", HttpStatus.UNAUTHORIZED);
- }
- }
-
- /**
- * 鑾峰彇鐢ㄦ埛
- **/
- public static LoginUser getLoginUser()
- {
- try
- {
- return (LoginUser) getAuthentication().getPrincipal();
- }
- catch (Exception e)
- {
- throw new CustomException("鑾峰彇鐢ㄦ埛淇℃伅寮傚父", HttpStatus.UNAUTHORIZED);
- }
- }
-
- /**
- * 鑾峰彇Authentication
- */
- public static Authentication getAuthentication()
- {
- return SecurityContextHolder.getContext().getAuthentication();
- }
-
- /**
- * 鐢熸垚BCryptPasswordEncoder瀵嗙爜
- *
- * @param password 瀵嗙爜
- * @return 鍔犲瘑瀛楃涓
- */
- public static String encryptPassword(String password)
- {
- BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
- return passwordEncoder.encode(password);
- }
-
- /**
- * 鍒ゆ柇瀵嗙爜鏄惁鐩稿悓
- *
- * @param rawPassword 鐪熷疄瀵嗙爜
- * @param encodedPassword 鍔犲瘑鍚庡瓧绗
- * @return 缁撴灉
- */
- public static boolean matchesPassword(String rawPassword, String encodedPassword)
- {
- BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
- return passwordEncoder.matches(rawPassword, encodedPassword);
- }
-
- /**
- * 鏄惁涓虹鐞嗗憳
- *
- * @param userId 鐢ㄦ埛ID
- * @return 缁撴灉
- */
- public static boolean isAdmin(Long userId)
- {
- return userId != null && 1L == userId;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/ServletUtils.java
deleted file mode 100644
index 9e6fd59a..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/ServletUtils.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.ruoyi.common.utils;
-
-import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-import com.ruoyi.common.core.text.Convert;
-
-/**
- * 瀹㈡埛绔伐鍏风被
- *
- * @author ruoyi
- */
-public class ServletUtils
-{
- /**
- * 鑾峰彇String鍙傛暟
- */
- public static String getParameter(String name)
- {
- return getRequest().getParameter(name);
- }
-
- /**
- * 鑾峰彇String鍙傛暟
- */
- public static String getParameter(String name, String defaultValue)
- {
- return Convert.toStr(getRequest().getParameter(name), defaultValue);
- }
-
- /**
- * 鑾峰彇Integer鍙傛暟
- */
- public static Integer getParameterToInt(String name)
- {
- return Convert.toInt(getRequest().getParameter(name));
- }
-
- /**
- * 鑾峰彇Integer鍙傛暟
- */
- public static Integer getParameterToInt(String name, Integer defaultValue)
- {
- return Convert.toInt(getRequest().getParameter(name), defaultValue);
- }
-
- /**
- * 鑾峰彇request
- */
- public static HttpServletRequest getRequest()
- {
- return getRequestAttributes().getRequest();
- }
-
- /**
- * 鑾峰彇response
- */
- public static HttpServletResponse getResponse()
- {
- return getRequestAttributes().getResponse();
- }
-
- /**
- * 鑾峰彇session
- */
- public static HttpSession getSession()
- {
- return getRequest().getSession();
- }
-
- public static ServletRequestAttributes getRequestAttributes()
- {
- RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
- return (ServletRequestAttributes) attributes;
- }
-
- /**
- * 灏嗗瓧绗︿覆娓叉煋鍒板鎴风
- *
- * @param response 娓叉煋瀵硅薄
- * @param string 寰呮覆鏌撶殑瀛楃涓
- * @return null
- */
- public static String renderString(HttpServletResponse response, String string)
- {
- try
- {
- response.setStatus(200);
- response.setContentType("application/json");
- response.setCharacterEncoding("utf-8");
- response.getWriter().print(string);
- }
- catch (IOException e)
- {
- e.printStackTrace();
- }
- return null;
- }
-
- /**
- * 鏄惁鏄疉jax寮傛璇锋眰
- *
- * @param request
- */
- public static boolean isAjaxRequest(HttpServletRequest request)
- {
- String accept = request.getHeader("accept");
- if (accept != null && accept.indexOf("application/json") != -1)
- {
- return true;
- }
-
- String xRequestedWith = request.getHeader("X-Requested-With");
- if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1)
- {
- return true;
- }
-
- String uri = request.getRequestURI();
- if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml"))
- {
- return true;
- }
-
- String ajax = request.getParameter("__ajax");
- if (StringUtils.inStringIgnoreCase(ajax, "json", "xml"))
- {
- return true;
- }
- return false;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/StringUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/StringUtils.java
deleted file mode 100644
index a865c35d..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/StringUtils.java
+++ /dev/null
@@ -1,453 +0,0 @@
-package com.ruoyi.common.utils;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import com.ruoyi.common.core.text.StrFormatter;
-
-/**
- * 瀛楃涓插伐鍏风被
- *
- * @author ruoyi
- */
-public class StringUtils extends org.apache.commons.lang3.StringUtils
-{
- /** 绌哄瓧绗︿覆 */
- private static final String NULLSTR = "";
-
- /** 涓嬪垝绾 */
- private static final char SEPARATOR = '_';
-
- /**
- * 鑾峰彇鍙傛暟涓嶄负绌哄
- *
- * @param value defaultValue 瑕佸垽鏂殑value
- * @return value 杩斿洖鍊
- */
- public static T nvl(T value, T defaultValue)
- {
- return value != null ? value : defaultValue;
- }
-
- /**
- * * 鍒ゆ柇涓涓狢ollection鏄惁涓虹┖锛 鍖呭惈List锛孲et锛孮ueue
- *
- * @param coll 瑕佸垽鏂殑Collection
- * @return true锛氫负绌 false锛氶潪绌
- */
- public static boolean isEmpty(Collection coll)
- {
- return isNull(coll) || coll.isEmpty();
- }
-
- /**
- * * 鍒ゆ柇涓涓狢ollection鏄惁闈炵┖锛屽寘鍚獿ist锛孲et锛孮ueue
- *
- * @param coll 瑕佸垽鏂殑Collection
- * @return true锛氶潪绌 false锛氱┖
- */
- public static boolean isNotEmpty(Collection coll)
- {
- return !isEmpty(coll);
- }
-
- /**
- * * 鍒ゆ柇涓涓璞℃暟缁勬槸鍚︿负绌
- *
- * @param objects 瑕佸垽鏂殑瀵硅薄鏁扮粍
- ** @return true锛氫负绌 false锛氶潪绌
- */
- public static boolean isEmpty(Object[] objects)
- {
- return isNull(objects) || (objects.length == 0);
- }
-
- /**
- * * 鍒ゆ柇涓涓璞℃暟缁勬槸鍚﹂潪绌
- *
- * @param objects 瑕佸垽鏂殑瀵硅薄鏁扮粍
- * @return true锛氶潪绌 false锛氱┖
- */
- public static boolean isNotEmpty(Object[] objects)
- {
- return !isEmpty(objects);
- }
-
- /**
- * * 鍒ゆ柇涓涓狹ap鏄惁涓虹┖
- *
- * @param map 瑕佸垽鏂殑Map
- * @return true锛氫负绌 false锛氶潪绌
- */
- public static boolean isEmpty(Map map)
- {
- return isNull(map) || map.isEmpty();
- }
-
- /**
- * * 鍒ゆ柇涓涓狹ap鏄惁涓虹┖
- *
- * @param map 瑕佸垽鏂殑Map
- * @return true锛氶潪绌 false锛氱┖
- */
- public static boolean isNotEmpty(Map map)
- {
- return !isEmpty(map);
- }
-
- /**
- * * 鍒ゆ柇涓涓瓧绗︿覆鏄惁涓虹┖涓
- *
- * @param str String
- * @return true锛氫负绌 false锛氶潪绌
- */
- public static boolean isEmpty(String str)
- {
- return isNull(str) || NULLSTR.equals(str.trim());
- }
-
- /**
- * * 鍒ゆ柇涓涓瓧绗︿覆鏄惁涓洪潪绌轰覆
- *
- * @param str String
- * @return true锛氶潪绌轰覆 false锛氱┖涓
- */
- public static boolean isNotEmpty(String str)
- {
- return !isEmpty(str);
- }
-
- /**
- * * 鍒ゆ柇涓涓璞℃槸鍚︿负绌
- *
- * @param object Object
- * @return true锛氫负绌 false锛氶潪绌
- */
- public static boolean isNull(Object object)
- {
- return object == null;
- }
-
- /**
- * * 鍒ゆ柇涓涓璞℃槸鍚﹂潪绌
- *
- * @param object Object
- * @return true锛氶潪绌 false锛氱┖
- */
- public static boolean isNotNull(Object object)
- {
- return !isNull(object);
- }
-
- /**
- * * 鍒ゆ柇涓涓璞℃槸鍚︽槸鏁扮粍绫诲瀷锛圝ava鍩烘湰鍨嬪埆鐨勬暟缁勶級
- *
- * @param object 瀵硅薄
- * @return true锛氭槸鏁扮粍 false锛氫笉鏄暟缁
- */
- public static boolean isArray(Object object)
- {
- return isNotNull(object) && object.getClass().isArray();
- }
-
- /**
- * 鍘荤┖鏍
- */
- public static String trim(String str)
- {
- return (str == null ? "" : str.trim());
- }
-
- /**
- * 鎴彇瀛楃涓
- *
- * @param str 瀛楃涓
- * @param start 寮濮
- * @return 缁撴灉
- */
- public static String substring(final String str, int start)
- {
- if (str == null)
- {
- return NULLSTR;
- }
-
- if (start < 0)
- {
- start = str.length() + start;
- }
-
- if (start < 0)
- {
- start = 0;
- }
- if (start > str.length())
- {
- return NULLSTR;
- }
-
- return str.substring(start);
- }
-
- /**
- * 鎴彇瀛楃涓
- *
- * @param str 瀛楃涓
- * @param start 寮濮
- * @param end 缁撴潫
- * @return 缁撴灉
- */
- public static String substring(final String str, int start, int end)
- {
- if (str == null)
- {
- return NULLSTR;
- }
-
- if (end < 0)
- {
- end = str.length() + end;
- }
- if (start < 0)
- {
- start = str.length() + start;
- }
-
- if (end > str.length())
- {
- end = str.length();
- }
-
- if (start > end)
- {
- return NULLSTR;
- }
-
- if (start < 0)
- {
- start = 0;
- }
- if (end < 0)
- {
- end = 0;
- }
-
- return str.substring(start, end);
- }
-
- /**
- * 鏍煎紡鍖栨枃鏈, {} 琛ㄧず鍗犱綅绗
- * 姝ゆ柟娉曞彧鏄畝鍗曞皢鍗犱綅绗 {} 鎸夌収椤哄簭鏇挎崲涓哄弬鏁
- * 濡傛灉鎯宠緭鍑 {} 浣跨敤 \\杞箟 { 鍗冲彲锛屽鏋滄兂杈撳嚭 {} 涔嬪墠鐨 \ 浣跨敤鍙岃浆涔夌 \\\\ 鍗冲彲
- * 渚嬶細
- * 閫氬父浣跨敤锛歠ormat("this is {} for {}", "a", "b") -> this is a for b
- * 杞箟{}锛 format("this is \\{} for {}", "a", "b") -> this is \{} for a
- * 杞箟\锛 format("this is \\\\{} for {}", "a", "b") -> this is \a for b
- *
- * @param template 鏂囨湰妯℃澘锛岃鏇挎崲鐨勯儴鍒嗙敤 {} 琛ㄧず
- * @param params 鍙傛暟鍊
- * @return 鏍煎紡鍖栧悗鐨勬枃鏈
- */
- public static String format(String template, Object... params)
- {
- if (isEmpty(params) || isEmpty(template))
- {
- return template;
- }
- return StrFormatter.format(template, params);
- }
-
- /**
- * 瀛楃涓茶浆set
- *
- * @param str 瀛楃涓
- * @param sep 鍒嗛殧绗
- * @return set闆嗗悎
- */
- public static final Set str2Set(String str, String sep)
- {
- return new HashSet(str2List(str, sep, true, false));
- }
-
- /**
- * 瀛楃涓茶浆list
- *
- * @param str 瀛楃涓
- * @param sep 鍒嗛殧绗
- * @param filterBlank 杩囨护绾┖鐧
- * @param trim 鍘绘帀棣栧熬绌虹櫧
- * @return list闆嗗悎
- */
- public static final List str2List(String str, String sep, boolean filterBlank, boolean trim)
- {
- List list = new ArrayList();
- if (StringUtils.isEmpty(str))
- {
- return list;
- }
-
- // 杩囨护绌虹櫧瀛楃涓
- if (filterBlank && StringUtils.isBlank(str))
- {
- return list;
- }
- String[] split = str.split(sep);
- for (String string : split)
- {
- if (filterBlank && StringUtils.isBlank(string))
- {
- continue;
- }
- if (trim)
- {
- string = string.trim();
- }
- list.add(string);
- }
-
- return list;
- }
-
- /**
- * 涓嬪垝绾胯浆椹煎嘲鍛藉悕
- */
- public static String toUnderScoreCase(String str)
- {
- if (str == null)
- {
- return null;
- }
- StringBuilder sb = new StringBuilder();
- // 鍓嶇疆瀛楃鏄惁澶у啓
- boolean preCharIsUpperCase = true;
- // 褰撳墠瀛楃鏄惁澶у啓
- boolean curreCharIsUpperCase = true;
- // 涓嬩竴瀛楃鏄惁澶у啓
- boolean nexteCharIsUpperCase = true;
- for (int i = 0; i < str.length(); i++)
- {
- char c = str.charAt(i);
- if (i > 0)
- {
- preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1));
- }
- else
- {
- preCharIsUpperCase = false;
- }
-
- curreCharIsUpperCase = Character.isUpperCase(c);
-
- if (i < (str.length() - 1))
- {
- nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1));
- }
-
- if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase)
- {
- sb.append(SEPARATOR);
- }
- else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase)
- {
- sb.append(SEPARATOR);
- }
- sb.append(Character.toLowerCase(c));
- }
-
- return sb.toString();
- }
-
- /**
- * 鏄惁鍖呭惈瀛楃涓
- *
- * @param str 楠岃瘉瀛楃涓
- * @param strs 瀛楃涓茬粍
- * @return 鍖呭惈杩斿洖true
- */
- public static boolean inStringIgnoreCase(String str, String... strs)
- {
- if (str != null && strs != null)
- {
- for (String s : strs)
- {
- if (str.equalsIgnoreCase(trim(s)))
- {
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * 灏嗕笅鍒掔嚎澶у啓鏂瑰紡鍛藉悕鐨勫瓧绗︿覆杞崲涓洪┘宄板紡銆傚鏋滆浆鎹㈠墠鐨勪笅鍒掔嚎澶у啓鏂瑰紡鍛藉悕鐨勫瓧绗︿覆涓虹┖锛屽垯杩斿洖绌哄瓧绗︿覆銆 渚嬪锛欻ELLO_WORLD->HelloWorld
- *
- * @param name 杞崲鍓嶇殑涓嬪垝绾垮ぇ鍐欐柟寮忓懡鍚嶇殑瀛楃涓
- * @return 杞崲鍚庣殑椹煎嘲寮忓懡鍚嶇殑瀛楃涓
- */
- public static String convertToCamelCase(String name)
- {
- StringBuilder result = new StringBuilder();
- // 蹇熸鏌
- if (name == null || name.isEmpty())
- {
- // 娌″繀瑕佽浆鎹
- return "";
- }
- else if (!name.contains("_"))
- {
- // 涓嶅惈涓嬪垝绾匡紝浠呭皢棣栧瓧姣嶅ぇ鍐
- return name.substring(0, 1).toUpperCase() + name.substring(1);
- }
- // 鐢ㄤ笅鍒掔嚎灏嗗師濮嬪瓧绗︿覆鍒嗗壊
- String[] camels = name.split("_");
- for (String camel : camels)
- {
- // 璺宠繃鍘熷瀛楃涓蹭腑寮澶淬佺粨灏剧殑涓嬫崲绾挎垨鍙岄噸涓嬪垝绾
- if (camel.isEmpty())
- {
- continue;
- }
- // 棣栧瓧姣嶅ぇ鍐
- result.append(camel.substring(0, 1).toUpperCase());
- result.append(camel.substring(1).toLowerCase());
- }
- return result.toString();
- }
-
- /**
- * 椹煎嘲寮忓懡鍚嶆硶 渚嬪锛歶ser_name->userName
- */
- public static String toCamelCase(String s)
- {
- if (s == null)
- {
- return null;
- }
- s = s.toLowerCase();
- StringBuilder sb = new StringBuilder(s.length());
- boolean upperCase = false;
- for (int i = 0; i < s.length(); i++)
- {
- char c = s.charAt(i);
-
- if (c == SEPARATOR)
- {
- upperCase = true;
- }
- else if (upperCase)
- {
- sb.append(Character.toUpperCase(c));
- upperCase = false;
- }
- else
- {
- sb.append(c);
- }
- }
- return sb.toString();
- }
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/Threads.java b/ruoyi/src/main/java/com/ruoyi/common/utils/Threads.java
deleted file mode 100644
index 395920a2..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/Threads.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.ruoyi.common.utils;
-
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * 绾跨▼鐩稿叧宸ュ叿绫.
- *
- * @author ruoyi
- */
-public class Threads
-{
- private static final Logger logger = LoggerFactory.getLogger(Threads.class);
-
- /**
- * sleep绛夊緟,鍗曚綅涓烘绉
- */
- public static void sleep(long milliseconds)
- {
- try
- {
- Thread.sleep(milliseconds);
- }
- catch (InterruptedException e)
- {
- return;
- }
- }
-
- /**
- * 鍋滄绾跨▼姹
- * 鍏堜娇鐢╯hutdown, 鍋滄鎺ユ敹鏂颁换鍔″苟灏濊瘯瀹屾垚鎵鏈夊凡瀛樺湪浠诲姟.
- * 濡傛灉瓒呮椂, 鍒欒皟鐢╯hutdownNow, 鍙栨秷鍦╳orkQueue涓璓ending鐨勪换鍔,骞朵腑鏂墍鏈夐樆濉炲嚱鏁.
- * 濡傛灉浠嶄汉瓒呮檪锛屽墖寮峰埗閫鍑.
- * 鍙﹀鍦╯hutdown鏃剁嚎绋嬫湰韬璋冪敤涓柇鍋氫簡澶勭悊.
- */
- public static void shutdownAndAwaitTermination(ExecutorService pool)
- {
- if (pool != null && !pool.isShutdown())
- {
- pool.shutdown();
- try
- {
- if (!pool.awaitTermination(120, TimeUnit.SECONDS))
- {
- pool.shutdownNow();
- if (!pool.awaitTermination(120, TimeUnit.SECONDS))
- {
- logger.info("Pool did not terminate");
- }
- }
- }
- catch (InterruptedException ie)
- {
- pool.shutdownNow();
- Thread.currentThread().interrupt();
- }
- }
- }
-
- /**
- * 鎵撳嵃绾跨▼寮傚父淇℃伅
- */
- public static void printException(Runnable r, Throwable t)
- {
- if (t == null && r instanceof Future)
- {
- try
- {
- Future future = (Future) r;
- if (future.isDone())
- {
- future.get();
- }
- }
- catch (CancellationException ce)
- {
- t = ce;
- }
- catch (ExecutionException ee)
- {
- t = ee.getCause();
- }
- catch (InterruptedException ie)
- {
- Thread.currentThread().interrupt();
- }
- }
- if (t != null)
- {
- logger.error(t.getMessage(), t);
- }
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java
deleted file mode 100644
index 80b8c84f..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java
+++ /dev/null
@@ -1,226 +0,0 @@
-package com.ruoyi.common.utils;
-
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.geom.AffineTransform;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.security.SecureRandom;
-import java.util.Arrays;
-import java.util.Random;
-import javax.imageio.ImageIO;
-
-/**
- * 楠岃瘉鐮佸伐鍏风被
- *
- * @author ruoyi
- */
-public class VerifyCodeUtils
-{
- // 浣跨敤鍒癆lgerian瀛椾綋锛岀郴缁熼噷娌℃湁鐨勮瘽闇瑕佸畨瑁呭瓧浣擄紝瀛椾綋鍙樉绀哄ぇ鍐欙紝鍘绘帀浜1,0,i,o鍑犱釜瀹规槗娣锋穯鐨勫瓧绗
- public static final String VERIFY_CODES = "123456789ABCDEFGHJKLMNPQRSTUVWXYZ";
-
- private static Random random = new SecureRandom();
-
- /**
- * 浣跨敤绯荤粺榛樿瀛楃婧愮敓鎴愰獙璇佺爜
- *
- * @param verifySize 楠岃瘉鐮侀暱搴
- * @return
- */
- public static String generateVerifyCode(int verifySize)
- {
- return generateVerifyCode(verifySize, VERIFY_CODES);
- }
-
- /**
- * 浣跨敤鎸囧畾婧愮敓鎴愰獙璇佺爜
- *
- * @param verifySize 楠岃瘉鐮侀暱搴
- * @param sources 楠岃瘉鐮佸瓧绗︽簮
- * @return
- */
- public static String generateVerifyCode(int verifySize, String sources)
- {
- if (sources == null || sources.length() == 0)
- {
- sources = VERIFY_CODES;
- }
- int codesLen = sources.length();
- Random rand = new Random(System.currentTimeMillis());
- StringBuilder verifyCode = new StringBuilder(verifySize);
- for (int i = 0; i < verifySize; i++)
- {
- verifyCode.append(sources.charAt(rand.nextInt(codesLen - 1)));
- }
- return verifyCode.toString();
- }
-
- /**
- * 杈撳嚭鎸囧畾楠岃瘉鐮佸浘鐗囨祦
- *
- * @param w
- * @param h
- * @param os
- * @param code
- * @throws IOException
- */
- public static void outputImage(int w, int h, OutputStream os, String code) throws IOException
- {
- int verifySize = code.length();
- BufferedImage image = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
- Random rand = new Random();
- Graphics2D g2 = image.createGraphics();
- g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
- Color[] colors = new Color[5];
- Color[] colorSpaces = new Color[] { Color.WHITE, Color.CYAN, Color.GRAY, Color.LIGHT_GRAY, Color.MAGENTA,
- Color.ORANGE, Color.PINK, Color.YELLOW };
- float[] fractions = new float[colors.length];
- for (int i = 0; i < colors.length; i++)
- {
- colors[i] = colorSpaces[rand.nextInt(colorSpaces.length)];
- fractions[i] = rand.nextFloat();
- }
- Arrays.sort(fractions);
-
- g2.setColor(Color.GRAY);// 璁剧疆杈规鑹
- g2.fillRect(0, 0, w, h);
-
- Color c = getRandColor(200, 250);
- g2.setColor(c);// 璁剧疆鑳屾櫙鑹
- g2.fillRect(0, 2, w, h - 4);
-
- // 缁樺埗骞叉壈绾
- Random random = new Random();
- g2.setColor(getRandColor(160, 200));// 璁剧疆绾挎潯鐨勯鑹
- for (int i = 0; i < 20; i++)
- {
- int x = random.nextInt(w - 1);
- int y = random.nextInt(h - 1);
- int xl = random.nextInt(6) + 1;
- int yl = random.nextInt(12) + 1;
- g2.drawLine(x, y, x + xl + 40, y + yl + 20);
- }
-
- // 娣诲姞鍣偣
- float yawpRate = 0.05f;// 鍣０鐜
- int area = (int) (yawpRate * w * h);
- for (int i = 0; i < area; i++)
- {
- int x = random.nextInt(w);
- int y = random.nextInt(h);
- int rgb = getRandomIntColor();
- image.setRGB(x, y, rgb);
- }
-
- shear(g2, w, h, c);// 浣垮浘鐗囨壄鏇
-
- g2.setColor(getRandColor(100, 160));
- int fontSize = h - 4;
- Font font = new Font("Algerian", Font.ITALIC, fontSize);
- g2.setFont(font);
- char[] chars = code.toCharArray();
- for (int i = 0; i < verifySize; i++)
- {
- AffineTransform affine = new AffineTransform();
- affine.setToRotation(Math.PI / 4 * rand.nextDouble() * (rand.nextBoolean() ? 1 : -1),
- (w / verifySize) * i + fontSize / 2, h / 2);
- g2.setTransform(affine);
- g2.drawChars(chars, i, 1, ((w - 10) / verifySize) * i + 5, h / 2 + fontSize / 2 - 10);
- }
-
- g2.dispose();
- ImageIO.write(image, "jpg", os);
- }
-
- private static Color getRandColor(int fc, int bc)
- {
- if (fc > 255)
- fc = 255;
- if (bc > 255)
- bc = 255;
- int r = fc + random.nextInt(bc - fc);
- int g = fc + random.nextInt(bc - fc);
- int b = fc + random.nextInt(bc - fc);
- return new Color(r, g, b);
- }
-
- private static int getRandomIntColor()
- {
- int[] rgb = getRandomRgb();
- int color = 0;
- for (int c : rgb)
- {
- color = color << 8;
- color = color | c;
- }
- return color;
- }
-
- private static int[] getRandomRgb()
- {
- int[] rgb = new int[3];
- for (int i = 0; i < 3; i++)
- {
- rgb[i] = random.nextInt(255);
- }
- return rgb;
- }
-
- private static void shear(Graphics g, int w1, int h1, Color color)
- {
- shearX(g, w1, h1, color);
- shearY(g, w1, h1, color);
- }
-
- private static void shearX(Graphics g, int w1, int h1, Color color)
- {
-
- int period = random.nextInt(2);
-
- boolean borderGap = true;
- int frames = 1;
- int phase = random.nextInt(2);
-
- for (int i = 0; i < h1; i++)
- {
- double d = (double) (period >> 1)
- * Math.sin((double) i / (double) period + (6.2831853071795862D * (double) phase) / (double) frames);
- g.copyArea(0, i, w1, 1, (int) d, 0);
- if (borderGap)
- {
- g.setColor(color);
- g.drawLine((int) d, i, 0, i);
- g.drawLine((int) d + w1, i, w1, i);
- }
- }
-
- }
-
- private static void shearY(Graphics g, int w1, int h1, Color color)
- {
-
- int period = random.nextInt(40) + 10; // 50;
-
- boolean borderGap = true;
- int frames = 20;
- int phase = 7;
- for (int i = 0; i < w1; i++)
- {
- double d = (double) (period >> 1)
- * Math.sin((double) i / (double) period + (6.2831853071795862D * (double) phase) / (double) frames);
- g.copyArea(i, 0, 1, h1, 0, (int) d);
- if (borderGap)
- {
- g.setColor(color);
- g.drawLine(i, (int) d, i, 0);
- g.drawLine(i, (int) d + h1, i, h1);
- }
-
- }
- }
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
deleted file mode 100644
index 6921fea7..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ /dev/null
@@ -1,243 +0,0 @@
-package com.ruoyi.common.utils.file;
-
-import java.io.File;
-import java.io.IOException;
-import org.apache.commons.io.FilenameUtils;
-import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException;
-import com.ruoyi.common.exception.file.FileSizeLimitExceededException;
-import com.ruoyi.common.exception.file.InvalidExtensionException;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.security.Md5Utils;
-import com.ruoyi.framework.config.RuoYiConfig;
-
-/**
- * 鏂囦欢涓婁紶宸ュ叿绫
- *
- * @author ruoyi
- */
-public class FileUploadUtils
-{
- /**
- * 榛樿澶у皬 50M
- */
- public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
-
- /**
- * 榛樿鐨勬枃浠跺悕鏈澶ч暱搴 100
- */
- public static final int DEFAULT_FILE_NAME_LENGTH = 100;
-
- /**
- * 榛樿涓婁紶鐨勫湴鍧
- */
- private static String defaultBaseDir = RuoYiConfig.getProfile();
-
- private static int counter = 0;
-
- public static void setDefaultBaseDir(String defaultBaseDir)
- {
- FileUploadUtils.defaultBaseDir = defaultBaseDir;
- }
-
- public static String getDefaultBaseDir()
- {
- return defaultBaseDir;
- }
-
- /**
- * 浠ラ粯璁ら厤缃繘琛屾枃浠朵笂浼
- *
- * @param file 涓婁紶鐨勬枃浠
- * @return 鏂囦欢鍚嶇О
- * @throws Exception
- */
- public static final String upload(MultipartFile file) throws IOException
- {
- try
- {
- return upload(getDefaultBaseDir(), file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
- }
- catch (Exception e)
- {
- throw new IOException(e.getMessage(), e);
- }
- }
-
- /**
- * 鏍规嵁鏂囦欢璺緞涓婁紶
- *
- * @param baseDir 鐩稿搴旂敤鐨勫熀鐩綍
- * @param file 涓婁紶鐨勬枃浠
- * @return 鏂囦欢鍚嶇О
- * @throws IOException
- */
- public static final String upload(String baseDir, MultipartFile file) throws IOException
- {
- try
- {
- return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
- }
- catch (Exception e)
- {
- throw new IOException(e.getMessage(), e);
- }
- }
-
- /**
- * 鏂囦欢涓婁紶
- *
- * @param baseDir 鐩稿搴旂敤鐨勫熀鐩綍
- * @param file 涓婁紶鐨勬枃浠
- * @param extension 涓婁紶鏂囦欢绫诲瀷
- * @return 杩斿洖涓婁紶鎴愬姛鐨勬枃浠跺悕
- * @throws FileSizeLimitExceededException 濡傛灉瓒呭嚭鏈澶уぇ灏
- * @throws FileNameLengthLimitExceededException 鏂囦欢鍚嶅お闀
- * @throws IOException 姣斿璇诲啓鏂囦欢鍑洪敊鏃
- * @throws InvalidExtensionException 鏂囦欢鏍￠獙寮傚父
- */
- public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension)
- throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
- InvalidExtensionException
- {
- int fileNamelength = file.getOriginalFilename().length();
- if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH)
- {
- throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH);
- }
-
- assertAllowed(file, allowedExtension);
-
- String fileName = extractFilename(file);
-
- File desc = getAbsoluteFile(baseDir, fileName);
- file.transferTo(desc);
- String pathFileName = getPathFileName(baseDir, fileName);
- return pathFileName;
- }
-
- /**
- * 缂栫爜鏂囦欢鍚
- */
- public static final String extractFilename(MultipartFile file)
- {
- String fileName = file.getOriginalFilename();
- String extension = getExtension(file);
- fileName = DateUtils.datePath() + "/" + encodingFilename(fileName) + "." + extension;
- return fileName;
- }
-
- private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException
- {
- File desc = new File(uploadDir + File.separator + fileName);
-
- if (!desc.getParentFile().exists())
- {
- desc.getParentFile().mkdirs();
- }
- if (!desc.exists())
- {
- desc.createNewFile();
- }
- return desc;
- }
-
- private static final String getPathFileName(String uploadDir, String fileName) throws IOException
- {
- int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
- String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
- String pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
- return pathFileName;
- }
-
- /**
- * 缂栫爜鏂囦欢鍚
- */
- private static final String encodingFilename(String fileName)
- {
- fileName = fileName.replace("_", " ");
- fileName = Md5Utils.hash(fileName + System.nanoTime() + counter++);
- return fileName;
- }
-
- /**
- * 鏂囦欢澶у皬鏍￠獙
- *
- * @param file 涓婁紶鐨勬枃浠
- * @return
- * @throws FileSizeLimitExceededException 濡傛灉瓒呭嚭鏈澶уぇ灏
- * @throws InvalidExtensionException
- */
- public static final void assertAllowed(MultipartFile file, String[] allowedExtension)
- throws FileSizeLimitExceededException, InvalidExtensionException
- {
- long size = file.getSize();
- if (DEFAULT_MAX_SIZE != -1 && size > DEFAULT_MAX_SIZE)
- {
- throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024);
- }
-
- String fileName = file.getOriginalFilename();
- String extension = getExtension(file);
- if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension))
- {
- if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION)
- {
- throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension,
- fileName);
- }
- else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION)
- {
- throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension,
- fileName);
- }
- else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION)
- {
- throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension,
- fileName);
- }
- else
- {
- throw new InvalidExtensionException(allowedExtension, extension, fileName);
- }
- }
-
- }
-
- /**
- * 鍒ゆ柇MIME绫诲瀷鏄惁鏄厑璁哥殑MIME绫诲瀷
- *
- * @param extension
- * @param allowedExtension
- * @return
- */
- public static final boolean isAllowedExtension(String extension, String[] allowedExtension)
- {
- for (String str : allowedExtension)
- {
- if (str.equalsIgnoreCase(extension))
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * 鑾峰彇鏂囦欢鍚嶇殑鍚庣紑
- *
- * @param file 琛ㄥ崟鏂囦欢
- * @return 鍚庣紑鍚
- */
- public static final String getExtension(MultipartFile file)
- {
- String extension = FilenameUtils.getExtension(file.getOriginalFilename());
- if (StringUtils.isEmpty(extension))
- {
- extension = MimeTypeUtils.getExtension(file.getContentType());
- }
- return extension;
- }
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
deleted file mode 100644
index 03f5aa2a..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.ruoyi.common.utils.file;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * 鏂囦欢澶勭悊宸ュ叿绫
- *
- * @author ruoyi
- */
-public class FileUtils
-{
- public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+";
-
- /**
- * 杈撳嚭鎸囧畾鏂囦欢鐨刡yte鏁扮粍
- *
- * @param filePath 鏂囦欢璺緞
- * @param os 杈撳嚭娴
- * @return
- */
- public static void writeBytes(String filePath, OutputStream os) throws IOException
- {
- FileInputStream fis = null;
- try
- {
- File file = new File(filePath);
- if (!file.exists())
- {
- throw new FileNotFoundException(filePath);
- }
- fis = new FileInputStream(file);
- byte[] b = new byte[1024];
- int length;
- while ((length = fis.read(b)) > 0)
- {
- os.write(b, 0, length);
- }
- }
- catch (IOException e)
- {
- throw e;
- }
- finally
- {
- if (os != null)
- {
- try
- {
- os.close();
- }
- catch (IOException e1)
- {
- e1.printStackTrace();
- }
- }
- if (fis != null)
- {
- try
- {
- fis.close();
- }
- catch (IOException e1)
- {
- e1.printStackTrace();
- }
- }
- }
- }
-
- /**
- * 鍒犻櫎鏂囦欢
- *
- * @param filePath 鏂囦欢
- * @return
- */
- public static boolean deleteFile(String filePath)
- {
- boolean flag = false;
- File file = new File(filePath);
- // 璺緞涓烘枃浠朵笖涓嶄负绌哄垯杩涜鍒犻櫎
- if (file.isFile() && file.exists())
- {
- file.delete();
- flag = true;
- }
- return flag;
- }
-
- /**
- * 鏂囦欢鍚嶇О楠岃瘉
- *
- * @param filename 鏂囦欢鍚嶇О
- * @return true 姝ｅ父 false 闈炴硶
- */
- public static boolean isValidFilename(String filename)
- {
- return filename.matches(FILENAME_PATTERN);
- }
-
- /**
- * 涓嬭浇鏂囦欢鍚嶉噸鏂扮紪鐮
- *
- * @param request 璇锋眰瀵硅薄
- * @param fileName 鏂囦欢鍚
- * @return 缂栫爜鍚庣殑鏂囦欢鍚
- */
- public static String setFileDownloadHeader(HttpServletRequest request, String fileName)
- throws UnsupportedEncodingException
- {
- final String agent = request.getHeader("USER-AGENT");
- String filename = fileName;
- if (agent.contains("MSIE"))
- {
- // IE娴忚鍣
- filename = URLEncoder.encode(filename, "utf-8");
- filename = filename.replace("+", " ");
- }
- else if (agent.contains("Firefox"))
- {
- // 鐏嫄娴忚鍣
- filename = new String(fileName.getBytes(), "ISO8859-1");
- }
- else if (agent.contains("Chrome"))
- {
- // google娴忚鍣
- filename = URLEncoder.encode(filename, "utf-8");
- }
- else
- {
- // 鍏跺畠娴忚鍣
- filename = URLEncoder.encode(filename, "utf-8");
- }
- return filename;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
deleted file mode 100644
index d179a918..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.ruoyi.common.utils.file;
-
-/**
- * 濯掍綋绫诲瀷宸ュ叿绫
- *
- * @author ruoyi
- */
-public class MimeTypeUtils
-{
- public static final String IMAGE_PNG = "image/png";
-
- public static final String IMAGE_JPG = "image/jpg";
-
- public static final String IMAGE_JPEG = "image/jpeg";
-
- public static final String IMAGE_BMP = "image/bmp";
-
- public static final String IMAGE_GIF = "image/gif";
-
- public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" };
-
- public static final String[] FLASH_EXTENSION = { "swf", "flv" };
-
- public static final String[] MEDIA_EXTENSION = { "swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg",
- "asf", "rm", "rmvb" };
-
- public static final String[] DEFAULT_ALLOWED_EXTENSION = {
- // 鍥剧墖
- "bmp", "gif", "jpg", "jpeg", "png",
- // word excel powerpoint
- "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
- // 鍘嬬缉鏂囦欢
- "rar", "zip", "gz", "bz2",
- // pdf
- "pdf" };
-
- public static String getExtension(String prefix)
- {
- switch (prefix)
- {
- case IMAGE_PNG:
- return "png";
- case IMAGE_JPG:
- return "jpg";
- case IMAGE_JPEG:
- return "jpeg";
- case IMAGE_BMP:
- return "bmp";
- case IMAGE_GIF:
- return "gif";
- default:
- return "";
- }
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java b/ruoyi/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
deleted file mode 100644
index 0f455275..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.ruoyi.common.utils.html;
-
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * 杞箟鍜屽弽杞箟宸ュ叿绫
- *
- * @author ruoyi
- */
-public class EscapeUtil
-{
- public static final String RE_HTML_MARK = "(<[^<]*?>)|(<[\\s]*?/[^<]*?>)|(<[^<]*?/[\\s]*?>)";
-
- private static final char[][] TEXT = new char[64][];
-
- static
- {
- for (int i = 0; i < 64; i++)
- {
- TEXT[i] = new char[] { (char) i };
- }
-
- // special HTML characters
- TEXT['\''] = "'".toCharArray(); // 鍗曞紩鍙
- TEXT['"'] = """.toCharArray(); // 鍗曞紩鍙
- TEXT['&'] = "&".toCharArray(); // &绗
- TEXT['<'] = "<".toCharArray(); // 灏忎簬鍙
- TEXT['>'] = ">".toCharArray(); // 澶т簬鍙
- }
-
- /**
- * 杞箟鏂囨湰涓殑HTML瀛楃涓哄畨鍏ㄧ殑瀛楃
- *
- * @param text 琚浆涔夌殑鏂囨湰
- * @return 杞箟鍚庣殑鏂囨湰
- */
- public static String escape(String text)
- {
- return encode(text);
- }
-
- /**
- * 杩樺師琚浆涔夌殑HTML鐗规畩瀛楃
- *
- * @param content 鍖呭惈杞箟绗︾殑HTML鍐呭
- * @return 杞崲鍚庣殑瀛楃涓
- */
- public static String unescape(String content)
- {
- return decode(content);
- }
-
- /**
- * 娓呴櫎鎵鏈塇TML鏍囩锛屼絾鏄笉鍒犻櫎鏍囩鍐呯殑鍐呭
- *
- * @param content 鏂囨湰
- * @return 娓呴櫎鏍囩鍚庣殑鏂囨湰
- */
- public static String clean(String content)
- {
- return new HTMLFilter().filter(content);
- }
-
- /**
- * Escape缂栫爜
- *
- * @param text 琚紪鐮佺殑鏂囨湰
- * @return 缂栫爜鍚庣殑瀛楃
- */
- private static String encode(String text)
- {
- int len;
- if ((text == null) || ((len = text.length()) == 0))
- {
- return StringUtils.EMPTY;
- }
- StringBuilder buffer = new StringBuilder(len + (len >> 2));
- char c;
- for (int i = 0; i < len; i++)
- {
- c = text.charAt(i);
- if (c < 64)
- {
- buffer.append(TEXT[c]);
- }
- else
- {
- buffer.append(c);
- }
- }
- return buffer.toString();
- }
-
- /**
- * Escape瑙ｇ爜
- *
- * @param content 琚浆涔夌殑鍐呭
- * @return 瑙ｇ爜鍚庣殑瀛楃涓
- */
- public static String decode(String content)
- {
- if (StringUtils.isEmpty(content))
- {
- return content;
- }
-
- StringBuilder tmp = new StringBuilder(content.length());
- int lastPos = 0, pos = 0;
- char ch;
- while (lastPos < content.length())
- {
- pos = content.indexOf("%", lastPos);
- if (pos == lastPos)
- {
- if (content.charAt(pos + 1) == 'u')
- {
- ch = (char) Integer.parseInt(content.substring(pos + 2, pos + 6), 16);
- tmp.append(ch);
- lastPos = pos + 6;
- }
- else
- {
- ch = (char) Integer.parseInt(content.substring(pos + 1, pos + 3), 16);
- tmp.append(ch);
- lastPos = pos + 3;
- }
- }
- else
- {
- if (pos == -1)
- {
- tmp.append(content.substring(lastPos));
- lastPos = content.length();
- }
- else
- {
- tmp.append(content.substring(lastPos, pos));
- lastPos = pos;
- }
- }
- }
- return tmp.toString();
- }
-
- public static void main(String[] args)
- {
- String html = "";
- System.out.println(EscapeUtil.clean(html));
- System.out.println(EscapeUtil.escape(html));
- System.out.println(EscapeUtil.unescape(html));
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java b/ruoyi/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
deleted file mode 100644
index 6244cd57..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
+++ /dev/null
@@ -1,569 +0,0 @@
-package com.ruoyi.common.utils.html;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * HTML杩囨护鍣紝鐢ㄤ簬鍘婚櫎XSS婕忔礊闅愭偅銆
- *
- * @author ruoyi
- */
-public final class HTMLFilter
-{
- /**
- * regex flag union representing /si modifiers in php
- **/
- private static final int REGEX_FLAGS_SI = Pattern.CASE_INSENSITIVE | Pattern.DOTALL;
- private static final Pattern P_COMMENTS = Pattern.compile("", Pattern.DOTALL);
- private static final Pattern P_COMMENT = Pattern.compile("^!--(.*)--$", REGEX_FLAGS_SI);
- private static final Pattern P_TAGS = Pattern.compile("<(.*?)>", Pattern.DOTALL);
- private static final Pattern P_END_TAG = Pattern.compile("^/([a-z0-9]+)", REGEX_FLAGS_SI);
- private static final Pattern P_START_TAG = Pattern.compile("^([a-z0-9]+)(.*?)(/?)$", REGEX_FLAGS_SI);
- private static final Pattern P_QUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)=([\"'])(.*?)\\2", REGEX_FLAGS_SI);
- private static final Pattern P_UNQUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)(=)([^\"\\s']+)", REGEX_FLAGS_SI);
- private static final Pattern P_PROTOCOL = Pattern.compile("^([^:]+):", REGEX_FLAGS_SI);
- private static final Pattern P_ENTITY = Pattern.compile("&#(\\d+);?");
- private static final Pattern P_ENTITY_UNICODE = Pattern.compile("&#x([0-9a-f]+);?");
- private static final Pattern P_ENCODE = Pattern.compile("%([0-9a-f]{2});?");
- private static final Pattern P_VALID_ENTITIES = Pattern.compile("&([^&;]*)(?=(;|&|$))");
- private static final Pattern P_VALID_QUOTES = Pattern.compile("(>|^)([^<]+?)(<|$)", Pattern.DOTALL);
- private static final Pattern P_END_ARROW = Pattern.compile("^>");
- private static final Pattern P_BODY_TO_END = Pattern.compile("<([^>]*?)(?=<|$)");
- private static final Pattern P_XML_CONTENT = Pattern.compile("(^|>)([^<]*?)(?=>)");
- private static final Pattern P_STRAY_LEFT_ARROW = Pattern.compile("<([^>]*?)(?=<|$)");
- private static final Pattern P_STRAY_RIGHT_ARROW = Pattern.compile("(^|>)([^<]*?)(?=>)");
- private static final Pattern P_AMP = Pattern.compile("&");
- private static final Pattern P_QUOTE = Pattern.compile("\"");
- private static final Pattern P_LEFT_ARROW = Pattern.compile("<");
- private static final Pattern P_RIGHT_ARROW = Pattern.compile(">");
- private static final Pattern P_BOTH_ARROWS = Pattern.compile("<>");
-
- // @xxx could grow large... maybe use sesat's ReferenceMap
- private static final ConcurrentMap P_REMOVE_PAIR_BLANKS = new ConcurrentHashMap<>();
- private static final ConcurrentMap P_REMOVE_SELF_BLANKS = new ConcurrentHashMap<>();
-
- /**
- * set of allowed html elements, along with allowed attributes for each element
- **/
- private final Map> vAllowed;
- /**
- * counts of open tags for each (allowable) html element
- **/
- private final Map vTagCounts = new HashMap<>();
-
- /**
- * html elements which must always be self-closing (e.g. "![]()
")
- **/
- private final String[] vSelfClosingTags;
- /**
- * html elements which must always have separate opening and closing tags (e.g. "")
- **/
- private final String[] vNeedClosingTags;
- /**
- * set of disallowed html elements
- **/
- private final String[] vDisallowed;
- /**
- * attributes which should be checked for valid protocols
- **/
- private final String[] vProtocolAtts;
- /**
- * allowed protocols
- **/
- private final String[] vAllowedProtocols;
- /**
- * tags which should be removed if they contain no content (e.g. "" or "")
- **/
- private final String[] vRemoveBlanks;
- /**
- * entities allowed within html markup
- **/
- private final String[] vAllowedEntities;
- /**
- * flag determining whether comments are allowed in input String.
- */
- private final boolean stripComment;
- private final boolean encodeQuotes;
- /**
- * flag determining whether to try to make tags when presented with "unbalanced" angle brackets (e.g. ""
- * becomes " text "). If set to false, unbalanced angle brackets will be html escaped.
- */
- private final boolean alwaysMakeTags;
-
- /**
- * Default constructor.
- */
- public HTMLFilter()
- {
- vAllowed = new HashMap<>();
-
- final ArrayList a_atts = new ArrayList<>();
- a_atts.add("href");
- a_atts.add("target");
- vAllowed.put("a", a_atts);
-
- final ArrayList img_atts = new ArrayList<>();
- img_atts.add("src");
- img_atts.add("width");
- img_atts.add("height");
- img_atts.add("alt");
- vAllowed.put("img", img_atts);
-
- final ArrayList no_atts = new ArrayList<>();
- vAllowed.put("b", no_atts);
- vAllowed.put("strong", no_atts);
- vAllowed.put("i", no_atts);
- vAllowed.put("em", no_atts);
-
- vSelfClosingTags = new String[] { "img" };
- vNeedClosingTags = new String[] { "a", "b", "strong", "i", "em" };
- vDisallowed = new String[] {};
- vAllowedProtocols = new String[] { "http", "mailto", "https" }; // no ftp.
- vProtocolAtts = new String[] { "src", "href" };
- vRemoveBlanks = new String[] { "a", "b", "strong", "i", "em" };
- vAllowedEntities = new String[] { "amp", "gt", "lt", "quot" };
- stripComment = true;
- encodeQuotes = true;
- alwaysMakeTags = true;
- }
-
- /**
- * Map-parameter configurable constructor.
- *
- * @param conf map containing configuration. keys match field names.
- */
- @SuppressWarnings("unchecked")
- public HTMLFilter(final Map conf)
- {
-
- assert conf.containsKey("vAllowed") : "configuration requires vAllowed";
- assert conf.containsKey("vSelfClosingTags") : "configuration requires vSelfClosingTags";
- assert conf.containsKey("vNeedClosingTags") : "configuration requires vNeedClosingTags";
- assert conf.containsKey("vDisallowed") : "configuration requires vDisallowed";
- assert conf.containsKey("vAllowedProtocols") : "configuration requires vAllowedProtocols";
- assert conf.containsKey("vProtocolAtts") : "configuration requires vProtocolAtts";
- assert conf.containsKey("vRemoveBlanks") : "configuration requires vRemoveBlanks";
- assert conf.containsKey("vAllowedEntities") : "configuration requires vAllowedEntities";
-
- vAllowed = Collections.unmodifiableMap((HashMap>) conf.get("vAllowed"));
- vSelfClosingTags = (String[]) conf.get("vSelfClosingTags");
- vNeedClosingTags = (String[]) conf.get("vNeedClosingTags");
- vDisallowed = (String[]) conf.get("vDisallowed");
- vAllowedProtocols = (String[]) conf.get("vAllowedProtocols");
- vProtocolAtts = (String[]) conf.get("vProtocolAtts");
- vRemoveBlanks = (String[]) conf.get("vRemoveBlanks");
- vAllowedEntities = (String[]) conf.get("vAllowedEntities");
- stripComment = conf.containsKey("stripComment") ? (Boolean) conf.get("stripComment") : true;
- encodeQuotes = conf.containsKey("encodeQuotes") ? (Boolean) conf.get("encodeQuotes") : true;
- alwaysMakeTags = conf.containsKey("alwaysMakeTags") ? (Boolean) conf.get("alwaysMakeTags") : true;
- }
-
- private void reset()
- {
- vTagCounts.clear();
- }
-
- // ---------------------------------------------------------------
- // my versions of some PHP library functions
- public static String chr(final int decimal)
- {
- return String.valueOf((char) decimal);
- }
-
- public static String htmlSpecialChars(final String s)
- {
- String result = s;
- result = regexReplace(P_AMP, "&", result);
- result = regexReplace(P_QUOTE, """, result);
- result = regexReplace(P_LEFT_ARROW, "<", result);
- result = regexReplace(P_RIGHT_ARROW, ">", result);
- return result;
- }
-
- // ---------------------------------------------------------------
-
- /**
- * given a user submitted input String, filter out any invalid or restricted html.
- *
- * @param input text (i.e. submitted by a user) than may contain html
- * @return "clean" version of input, with only valid, whitelisted html elements allowed
- */
- public String filter(final String input)
- {
- reset();
- String s = input;
-
- s = escapeComments(s);
-
- s = balanceHTML(s);
-
- s = checkTags(s);
-
- s = processRemoveBlanks(s);
-
- s = validateEntities(s);
-
- return s;
- }
-
- public boolean isAlwaysMakeTags()
- {
- return alwaysMakeTags;
- }
-
- public boolean isStripComments()
- {
- return stripComment;
- }
-
- private String escapeComments(final String s)
- {
- final Matcher m = P_COMMENTS.matcher(s);
- final StringBuffer buf = new StringBuffer();
- if (m.find())
- {
- final String match = m.group(1); // (.*?)
- m.appendReplacement(buf, Matcher.quoteReplacement(""));
- }
- m.appendTail(buf);
-
- return buf.toString();
- }
-
- private String balanceHTML(String s)
- {
- if (alwaysMakeTags)
- {
- //
- // try and form html
- //
- s = regexReplace(P_END_ARROW, "", s);
- s = regexReplace(P_BODY_TO_END, "<$1>", s);
- s = regexReplace(P_XML_CONTENT, "$1<$2", s);
-
- }
- else
- {
- //
- // escape stray brackets
- //
- s = regexReplace(P_STRAY_LEFT_ARROW, "<$1", s);
- s = regexReplace(P_STRAY_RIGHT_ARROW, "$1$2><", s);
-
- //
- // the last regexp causes '<>' entities to appear
- // (we need to do a lookahead assertion so that the last bracket can
- // be used in the next pass of the regexp)
- //
- s = regexReplace(P_BOTH_ARROWS, "", s);
- }
-
- return s;
- }
-
- private String checkTags(String s)
- {
- Matcher m = P_TAGS.matcher(s);
-
- final StringBuffer buf = new StringBuffer();
- while (m.find())
- {
- String replaceStr = m.group(1);
- replaceStr = processTag(replaceStr);
- m.appendReplacement(buf, Matcher.quoteReplacement(replaceStr));
- }
- m.appendTail(buf);
-
- // these get tallied in processTag
- // (remember to reset before subsequent calls to filter method)
- final StringBuilder sBuilder = new StringBuilder(buf.toString());
- for (String key : vTagCounts.keySet())
- {
- for (int ii = 0; ii < vTagCounts.get(key); ii++)
- {
- sBuilder.append("");
- }
- }
- s = sBuilder.toString();
-
- return s;
- }
-
- private String processRemoveBlanks(final String s)
- {
- String result = s;
- for (String tag : vRemoveBlanks)
- {
- if (!P_REMOVE_PAIR_BLANKS.containsKey(tag))
- {
- P_REMOVE_PAIR_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?>"));
- }
- result = regexReplace(P_REMOVE_PAIR_BLANKS.get(tag), "", result);
- if (!P_REMOVE_SELF_BLANKS.containsKey(tag))
- {
- P_REMOVE_SELF_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?/>"));
- }
- result = regexReplace(P_REMOVE_SELF_BLANKS.get(tag), "", result);
- }
-
- return result;
- }
-
- private static String regexReplace(final Pattern regex_pattern, final String replacement, final String s)
- {
- Matcher m = regex_pattern.matcher(s);
- return m.replaceAll(replacement);
- }
-
- private String processTag(final String s)
- {
- // ending tags
- Matcher m = P_END_TAG.matcher(s);
- if (m.find())
- {
- final String name = m.group(1).toLowerCase();
- if (allowed(name))
- {
- if (false == inArray(name, vSelfClosingTags))
- {
- if (vTagCounts.containsKey(name))
- {
- vTagCounts.put(name, vTagCounts.get(name) - 1);
- return "";
- }
- }
- }
- }
-
- // starting tags
- m = P_START_TAG.matcher(s);
- if (m.find())
- {
- final String name = m.group(1).toLowerCase();
- final String body = m.group(2);
- String ending = m.group(3);
-
- // debug( "in a starting tag, name='" + name + "'; body='" + body + "'; ending='" + ending + "'" );
- if (allowed(name))
- {
- final StringBuilder params = new StringBuilder();
-
- final Matcher m2 = P_QUOTED_ATTRIBUTES.matcher(body);
- final Matcher m3 = P_UNQUOTED_ATTRIBUTES.matcher(body);
- final List paramNames = new ArrayList<>();
- final List paramValues = new ArrayList<>();
- while (m2.find())
- {
- paramNames.add(m2.group(1)); // ([a-z0-9]+)
- paramValues.add(m2.group(3)); // (.*?)
- }
- while (m3.find())
- {
- paramNames.add(m3.group(1)); // ([a-z0-9]+)
- paramValues.add(m3.group(3)); // ([^\"\\s']+)
- }
-
- String paramName, paramValue;
- for (int ii = 0; ii < paramNames.size(); ii++)
- {
- paramName = paramNames.get(ii).toLowerCase();
- paramValue = paramValues.get(ii);
-
- // debug( "paramName='" + paramName + "'" );
- // debug( "paramValue='" + paramValue + "'" );
- // debug( "allowed? " + vAllowed.get( name ).contains( paramName ) );
-
- if (allowedAttribute(name, paramName))
- {
- if (inArray(paramName, vProtocolAtts))
- {
- paramValue = processParamProtocol(paramValue);
- }
- params.append(' ').append(paramName).append("=\"").append(paramValue).append("\"");
- }
- }
-
- if (inArray(name, vSelfClosingTags))
- {
- ending = " /";
- }
-
- if (inArray(name, vNeedClosingTags))
- {
- ending = "";
- }
-
- if (ending == null || ending.length() < 1)
- {
- if (vTagCounts.containsKey(name))
- {
- vTagCounts.put(name, vTagCounts.get(name) + 1);
- }
- else
- {
- vTagCounts.put(name, 1);
- }
- }
- else
- {
- ending = " /";
- }
- return "<" + name + params + ending + ">";
- }
- else
- {
- return "";
- }
- }
-
- // comments
- m = P_COMMENT.matcher(s);
- if (!stripComment && m.find())
- {
- return "<" + m.group() + ">";
- }
-
- return "";
- }
-
- private String processParamProtocol(String s)
- {
- s = decodeEntities(s);
- final Matcher m = P_PROTOCOL.matcher(s);
- if (m.find())
- {
- final String protocol = m.group(1);
- if (!inArray(protocol, vAllowedProtocols))
- {
- // bad protocol, turn into local anchor link instead
- s = "#" + s.substring(protocol.length() + 1);
- if (s.startsWith("#//"))
- {
- s = "#" + s.substring(3);
- }
- }
- }
-
- return s;
- }
-
- private String decodeEntities(String s)
- {
- StringBuffer buf = new StringBuffer();
-
- Matcher m = P_ENTITY.matcher(s);
- while (m.find())
- {
- final String match = m.group(1);
- final int decimal = Integer.decode(match).intValue();
- m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
- }
- m.appendTail(buf);
- s = buf.toString();
-
- buf = new StringBuffer();
- m = P_ENTITY_UNICODE.matcher(s);
- while (m.find())
- {
- final String match = m.group(1);
- final int decimal = Integer.valueOf(match, 16).intValue();
- m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
- }
- m.appendTail(buf);
- s = buf.toString();
-
- buf = new StringBuffer();
- m = P_ENCODE.matcher(s);
- while (m.find())
- {
- final String match = m.group(1);
- final int decimal = Integer.valueOf(match, 16).intValue();
- m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
- }
- m.appendTail(buf);
- s = buf.toString();
-
- s = validateEntities(s);
- return s;
- }
-
- private String validateEntities(final String s)
- {
- StringBuffer buf = new StringBuffer();
-
- // validate entities throughout the string
- Matcher m = P_VALID_ENTITIES.matcher(s);
- while (m.find())
- {
- final String one = m.group(1); // ([^&;]*)
- final String two = m.group(2); // (?=(;|&|$))
- m.appendReplacement(buf, Matcher.quoteReplacement(checkEntity(one, two)));
- }
- m.appendTail(buf);
-
- return encodeQuotes(buf.toString());
- }
-
- private String encodeQuotes(final String s)
- {
- if (encodeQuotes)
- {
- StringBuffer buf = new StringBuffer();
- Matcher m = P_VALID_QUOTES.matcher(s);
- while (m.find())
- {
- final String one = m.group(1); // (>|^)
- final String two = m.group(2); // ([^<]+?)
- final String three = m.group(3); // (<|$)
- // 涓嶆浛鎹㈠弻寮曞彿涓"锛岄槻姝son鏍煎紡鏃犳晥 regexReplace(P_QUOTE, """, two)
- m.appendReplacement(buf, Matcher.quoteReplacement(one + two + three));
- }
- m.appendTail(buf);
- return buf.toString();
- }
- else
- {
- return s;
- }
- }
-
- private String checkEntity(final String preamble, final String term)
- {
-
- return ";".equals(term) && isValidEntity(preamble) ? '&' + preamble : "&" + preamble;
- }
-
- private boolean isValidEntity(final String entity)
- {
- return inArray(entity, vAllowedEntities);
- }
-
- private static boolean inArray(final String s, final String[] array)
- {
- for (String item : array)
- {
- if (item != null && item.equals(s))
- {
- return true;
- }
- }
- return false;
- }
-
- private boolean allowed(final String name)
- {
- return (vAllowed.isEmpty() || vAllowed.containsKey(name)) && !inArray(name, vDisallowed);
- }
-
- private boolean allowedAttribute(final String name, final String paramName)
- {
- return allowed(name) && (vAllowed.isEmpty() || vAllowed.get(name).contains(paramName));
- }
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
deleted file mode 100644
index 323dbc1a..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package com.ruoyi.common.utils.http;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.net.ConnectException;
-import java.net.SocketTimeoutException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.security.cert.X509Certificate;
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * 閫氱敤http鍙戦佹柟娉
- *
- * @author ruoyi
- */
-public class HttpUtils
-{
- private static final Logger log = LoggerFactory.getLogger(HttpUtils.class);
-
- /**
- * 鍚戞寚瀹 URL 鍙戦丟ET鏂规硶鐨勮姹
- *
- * @param url 鍙戦佽姹傜殑 URL
- * @param param 璇锋眰鍙傛暟锛岃姹傚弬鏁板簲璇ユ槸 name1=value1&name2=value2 鐨勫舰寮忋
- * @return 鎵浠ｈ〃杩滅▼璧勬簮鐨勫搷搴旂粨鏋
- */
- public static String sendGet(String url, String param)
- {
- StringBuilder result = new StringBuilder();
- BufferedReader in = null;
- try
- {
- String urlNameString = url + "?" + param;
- log.info("sendGet - {}", urlNameString);
- URL realUrl = new URL(urlNameString);
- URLConnection connection = realUrl.openConnection();
- connection.setRequestProperty("accept", "*/*");
- connection.setRequestProperty("connection", "Keep-Alive");
- connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
- connection.connect();
- in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
- String line;
- while ((line = in.readLine()) != null)
- {
- result.append(line);
- }
- log.info("recv - {}", result);
- }
- catch (ConnectException e)
- {
- log.error("璋冪敤HttpUtils.sendGet ConnectException, url=" + url + ",param=" + param, e);
- }
- catch (SocketTimeoutException e)
- {
- log.error("璋冪敤HttpUtils.sendGet SocketTimeoutException, url=" + url + ",param=" + param, e);
- }
- catch (IOException e)
- {
- log.error("璋冪敤HttpUtils.sendGet IOException, url=" + url + ",param=" + param, e);
- }
- catch (Exception e)
- {
- log.error("璋冪敤HttpsUtil.sendGet Exception, url=" + url + ",param=" + param, e);
- }
- finally
- {
- try
- {
- if (in != null)
- {
- in.close();
- }
- }
- catch (Exception ex)
- {
- log.error("璋冪敤in.close Exception, url=" + url + ",param=" + param, ex);
- }
- }
- return result.toString();
- }
-
- /**
- * 鍚戞寚瀹 URL 鍙戦丳OST鏂规硶鐨勮姹
- *
- * @param url 鍙戦佽姹傜殑 URL
- * @param param 璇锋眰鍙傛暟锛岃姹傚弬鏁板簲璇ユ槸 name1=value1&name2=value2 鐨勫舰寮忋
- * @return 鎵浠ｈ〃杩滅▼璧勬簮鐨勫搷搴旂粨鏋
- */
- public static String sendPost(String url, String param)
- {
- PrintWriter out = null;
- BufferedReader in = null;
- StringBuilder result = new StringBuilder();
- try
- {
- String urlNameString = url + "?" + param;
- log.info("sendPost - {}", urlNameString);
- URL realUrl = new URL(urlNameString);
- URLConnection conn = realUrl.openConnection();
- conn.setRequestProperty("accept", "*/*");
- conn.setRequestProperty("connection", "Keep-Alive");
- conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
- conn.setRequestProperty("Accept-Charset", "utf-8");
- conn.setRequestProperty("contentType", "utf-8");
- conn.setDoOutput(true);
- conn.setDoInput(true);
- out = new PrintWriter(conn.getOutputStream());
- out.print(param);
- out.flush();
- in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8"));
- String line;
- while ((line = in.readLine()) != null)
- {
- result.append(line);
- }
- log.info("recv - {}", result);
- }
- catch (ConnectException e)
- {
- log.error("璋冪敤HttpUtils.sendPost ConnectException, url=" + url + ",param=" + param, e);
- }
- catch (SocketTimeoutException e)
- {
- log.error("璋冪敤HttpUtils.sendPost SocketTimeoutException, url=" + url + ",param=" + param, e);
- }
- catch (IOException e)
- {
- log.error("璋冪敤HttpUtils.sendPost IOException, url=" + url + ",param=" + param, e);
- }
- catch (Exception e)
- {
- log.error("璋冪敤HttpsUtil.sendPost Exception, url=" + url + ",param=" + param, e);
- }
- finally
- {
- try
- {
- if (out != null)
- {
- out.close();
- }
- if (in != null)
- {
- in.close();
- }
- }
- catch (IOException ex)
- {
- log.error("璋冪敤in.close Exception, url=" + url + ",param=" + param, ex);
- }
- }
- return result.toString();
- }
-
- public static String sendSSLPost(String url, String param)
- {
- StringBuilder result = new StringBuilder();
- String urlNameString = url + "?" + param;
- try
- {
- log.info("sendSSLPost - {}", urlNameString);
- SSLContext sc = SSLContext.getInstance("SSL");
- sc.init(null, new TrustManager[] { new TrustAnyTrustManager() }, new java.security.SecureRandom());
- URL console = new URL(urlNameString);
- HttpsURLConnection conn = (HttpsURLConnection) console.openConnection();
- conn.setRequestProperty("accept", "*/*");
- conn.setRequestProperty("connection", "Keep-Alive");
- conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
- conn.setRequestProperty("Accept-Charset", "utf-8");
- conn.setRequestProperty("contentType", "utf-8");
- conn.setDoOutput(true);
- conn.setDoInput(true);
-
- conn.setSSLSocketFactory(sc.getSocketFactory());
- conn.setHostnameVerifier(new TrustAnyHostnameVerifier());
- conn.connect();
- InputStream is = conn.getInputStream();
- BufferedReader br = new BufferedReader(new InputStreamReader(is));
- String ret = "";
- while ((ret = br.readLine()) != null)
- {
- if (ret != null && !ret.trim().equals(""))
- {
- result.append(new String(ret.getBytes("ISO-8859-1"), "utf-8"));
- }
- }
- log.info("recv - {}", result);
- conn.disconnect();
- br.close();
- }
- catch (ConnectException e)
- {
- log.error("璋冪敤HttpUtils.sendSSLPost ConnectException, url=" + url + ",param=" + param, e);
- }
- catch (SocketTimeoutException e)
- {
- log.error("璋冪敤HttpUtils.sendSSLPost SocketTimeoutException, url=" + url + ",param=" + param, e);
- }
- catch (IOException e)
- {
- log.error("璋冪敤HttpUtils.sendSSLPost IOException, url=" + url + ",param=" + param, e);
- }
- catch (Exception e)
- {
- log.error("璋冪敤HttpsUtil.sendSSLPost Exception, url=" + url + ",param=" + param, e);
- }
- return result.toString();
- }
-
- private static class TrustAnyTrustManager implements X509TrustManager
- {
- @Override
- public void checkClientTrusted(X509Certificate[] chain, String authType)
- {
- }
-
- @Override
- public void checkServerTrusted(X509Certificate[] chain, String authType)
- {
- }
-
- @Override
- public X509Certificate[] getAcceptedIssuers()
- {
- return new X509Certificate[] {};
- }
- }
-
- private static class TrustAnyHostnameVerifier implements HostnameVerifier
- {
- @Override
- public boolean verify(String hostname, SSLSession session)
- {
- return true;
- }
- }
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
deleted file mode 100644
index d70351f9..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.ruoyi.common.utils.ip;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.http.HttpUtils;
-
-/**
- * 鑾峰彇鍦板潃绫
- *
- * @author ruoyi
- */
-public class AddressUtils
-{
- private static final Logger log = LoggerFactory.getLogger(AddressUtils.class);
-
- public static final String IP_URL = "http://ip.taobao.com/service/getIpInfo.php";
-
- public static String getRealAddressByIP(String ip)
- {
- String address = "XX XX";
- // 鍐呯綉涓嶆煡璇
- if (IpUtils.internalIp(ip))
- {
- return "鍐呯綉IP";
- }
- String rspStr = HttpUtils.sendPost(IP_URL, "ip=" + ip);
- if (StringUtils.isEmpty(rspStr))
- {
- log.error("鑾峰彇鍦扮悊浣嶇疆寮傚父 {}", ip);
- return address;
- }
- JSONObject obj = JSONObject.parseObject(rspStr);
- JSONObject data = obj.getObject("data", JSONObject.class);
- String region = data.getString("region");
- String city = data.getString("city");
- address = region + " " + city;
- return address;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
deleted file mode 100644
index 9e050e9f..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package com.ruoyi.common.utils.ip;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import javax.servlet.http.HttpServletRequest;
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * 鑾峰彇IP鏂规硶
- *
- * @author ruoyi
- */
-public class IpUtils
-{
- public static String getIpAddr(HttpServletRequest request)
- {
- if (request == null)
- {
- return "unknown";
- }
- String ip = request.getHeader("x-forwarded-for");
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
- {
- ip = request.getHeader("Proxy-Client-IP");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
- {
- ip = request.getHeader("X-Forwarded-For");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
- {
- ip = request.getHeader("WL-Proxy-Client-IP");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
- {
- ip = request.getHeader("X-Real-IP");
- }
-
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
- {
- ip = request.getRemoteAddr();
- }
-
- return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : ip;
- }
-
- public static boolean internalIp(String ip)
- {
- byte[] addr = textToNumericFormatV4(ip);
- return internalIp(addr) || "127.0.0.1".equals(ip);
- }
-
- private static boolean internalIp(byte[] addr)
- {
- if (StringUtils.isNull(addr) || addr.length < 2)
- {
- return true;
- }
- final byte b0 = addr[0];
- final byte b1 = addr[1];
- // 10.x.x.x/8
- final byte SECTION_1 = 0x0A;
- // 172.16.x.x/12
- final byte SECTION_2 = (byte) 0xAC;
- final byte SECTION_3 = (byte) 0x10;
- final byte SECTION_4 = (byte) 0x1F;
- // 192.168.x.x/16
- final byte SECTION_5 = (byte) 0xC0;
- final byte SECTION_6 = (byte) 0xA8;
- switch (b0)
- {
- case SECTION_1:
- return true;
- case SECTION_2:
- if (b1 >= SECTION_3 && b1 <= SECTION_4)
- {
- return true;
- }
- case SECTION_5:
- switch (b1)
- {
- case SECTION_6:
- return true;
- }
- default:
- return false;
- }
- }
-
- /**
- * 灏咺Pv4鍦板潃杞崲鎴愬瓧鑺
- *
- * @param text IPv4鍦板潃
- * @return byte 瀛楄妭
- */
- public static byte[] textToNumericFormatV4(String text)
- {
- if (text.length() == 0)
- {
- return null;
- }
-
- byte[] bytes = new byte[4];
- String[] elements = text.split("\\.", -1);
- try
- {
- long l;
- int i;
- switch (elements.length)
- {
- case 1:
- l = Long.parseLong(elements[0]);
- if ((l < 0L) || (l > 4294967295L))
- return null;
- bytes[0] = (byte) (int) (l >> 24 & 0xFF);
- bytes[1] = (byte) (int) ((l & 0xFFFFFF) >> 16 & 0xFF);
- bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF);
- bytes[3] = (byte) (int) (l & 0xFF);
- break;
- case 2:
- l = Integer.parseInt(elements[0]);
- if ((l < 0L) || (l > 255L))
- return null;
- bytes[0] = (byte) (int) (l & 0xFF);
- l = Integer.parseInt(elements[1]);
- if ((l < 0L) || (l > 16777215L))
- return null;
- bytes[1] = (byte) (int) (l >> 16 & 0xFF);
- bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF);
- bytes[3] = (byte) (int) (l & 0xFF);
- break;
- case 3:
- for (i = 0; i < 2; ++i)
- {
- l = Integer.parseInt(elements[i]);
- if ((l < 0L) || (l > 255L))
- return null;
- bytes[i] = (byte) (int) (l & 0xFF);
- }
- l = Integer.parseInt(elements[2]);
- if ((l < 0L) || (l > 65535L))
- return null;
- bytes[2] = (byte) (int) (l >> 8 & 0xFF);
- bytes[3] = (byte) (int) (l & 0xFF);
- break;
- case 4:
- for (i = 0; i < 4; ++i)
- {
- l = Integer.parseInt(elements[i]);
- if ((l < 0L) || (l > 255L))
- return null;
- bytes[i] = (byte) (int) (l & 0xFF);
- }
- break;
- default:
- return null;
- }
- }
- catch (NumberFormatException e)
- {
- return null;
- }
- return bytes;
- }
-
- public static String getHostIp()
- {
- try
- {
- return InetAddress.getLocalHost().getHostAddress();
- }
- catch (UnknownHostException e)
- {
- }
- return "127.0.0.1";
- }
-
- public static String getHostName()
- {
- try
- {
- return InetAddress.getLocalHost().getHostName();
- }
- catch (UnknownHostException e)
- {
- }
- return "鏈煡";
- }
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
deleted file mode 100644
index 27652fe1..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ /dev/null
@@ -1,872 +0,0 @@
-package com.ruoyi.common.utils.poi;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import org.apache.poi.hssf.usermodel.HSSFDateUtil;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFDataValidation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel.Type;
-import com.ruoyi.framework.aspectj.lang.annotation.Excels;
-import com.ruoyi.framework.config.RuoYiConfig;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.exception.CustomException;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.reflect.ReflectUtils;
-
-/**
- * Excel鐩稿叧澶勭悊
- *
- * @author ruoyi
- */
-public class ExcelUtil
-{
- private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);
-
- /**
- * Excel sheet鏈澶ц鏁帮紝榛樿65536
- */
- public static final int sheetSize = 65536;
-
- /**
- * 宸ヤ綔琛ㄥ悕绉
- */
- private String sheetName;
-
- /**
- * 瀵煎嚭绫诲瀷锛圗XPORT:瀵煎嚭鏁版嵁锛汭MPORT锛氬鍏ユā鏉匡級
- */
- private Type type;
-
- /**
- * 宸ヤ綔钖勫璞
- */
- private Workbook wb;
-
- /**
- * 宸ヤ綔琛ㄥ璞
- */
- private Sheet sheet;
-
- /**
- * 鏍峰紡鍒楄〃
- */
- private Map styles;
-
- /**
- * 瀵煎叆瀵煎嚭鏁版嵁鍒楄〃
- */
- private List list;
-
- /**
- * 娉ㄨВ鍒楄〃
- */
- private List fields;
-
- /**
- * 瀹炰綋瀵硅薄
- */
- public Class clazz;
-
- public ExcelUtil(Class clazz)
- {
- this.clazz = clazz;
- }
-
- public void init(List list, String sheetName, Type type)
- {
- if (list == null)
- {
- list = new ArrayList();
- }
- this.list = list;
- this.sheetName = sheetName;
- this.type = type;
- createExcelField();
- createWorkbook();
- }
-
- /**
- * 瀵筫xcel琛ㄥ崟榛樿绗竴涓储寮曞悕杞崲鎴恖ist
- *
- * @param is 杈撳叆娴
- * @return 杞崲鍚庨泦鍚
- */
- public List importExcel(InputStream is) throws Exception
- {
- return importExcel(StringUtils.EMPTY, is);
- }
-
- /**
- * 瀵筫xcel琛ㄥ崟鎸囧畾琛ㄦ牸绱㈠紩鍚嶈浆鎹㈡垚list
- *
- * @param sheetName 琛ㄦ牸绱㈠紩鍚
- * @param is 杈撳叆娴
- * @return 杞崲鍚庨泦鍚
- */
- public List importExcel(String sheetName, InputStream is) throws Exception
- {
- this.type = Type.IMPORT;
- this.wb = WorkbookFactory.create(is);
- List list = new ArrayList();
- Sheet sheet = null;
- if (StringUtils.isNotEmpty(sheetName))
- {
- // 濡傛灉鎸囧畾sheet鍚,鍒欏彇鎸囧畾sheet涓殑鍐呭.
- sheet = wb.getSheet(sheetName);
- }
- else
- {
- // 濡傛灉浼犲叆鐨剆heet鍚嶄笉瀛樺湪鍒欓粯璁ゆ寚鍚戠1涓猻heet.
- sheet = wb.getSheetAt(0);
- }
-
- if (sheet == null)
- {
- throw new IOException("鏂囦欢sheet涓嶅瓨鍦");
- }
-
- int rows = sheet.getPhysicalNumberOfRows();
-
- if (rows > 0)
- {
- // 瀹氫箟涓涓猰ap鐢ㄤ簬瀛樻斁excel鍒楃殑搴忓彿鍜宖ield.
- Map cellMap = new HashMap();
- // 鑾峰彇琛ㄥご
- Row heard = sheet.getRow(0);
- for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
- {
- Cell cell = heard.getCell(i);
- if (StringUtils.isNotNull(cell != null))
- {
- String value = this.getCellValue(heard, i).toString();
- cellMap.put(value, i);
- }
- else
- {
- cellMap.put(null, i);
- }
- }
- // 鏈夋暟鎹椂鎵嶅鐞 寰楀埌绫荤殑鎵鏈塮ield.
- Field[] allFields = clazz.getDeclaredFields();
- // 瀹氫箟涓涓猰ap鐢ㄤ簬瀛樻斁鍒楃殑搴忓彿鍜宖ield.
- Map fieldsMap = new HashMap();
- for (int col = 0; col < allFields.length; col++)
- {
- Field field = allFields[col];
- Excel attr = field.getAnnotation(Excel.class);
- if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
- {
- // 璁剧疆绫荤殑绉佹湁瀛楁灞炴у彲璁块棶.
- field.setAccessible(true);
- Integer column = cellMap.get(attr.name());
- fieldsMap.put(column, field);
- }
- }
- for (int i = 1; i < rows; i++)
- {
- // 浠庣2琛屽紑濮嬪彇鏁版嵁,榛樿绗竴琛屾槸琛ㄥご.
- Row row = sheet.getRow(i);
- T entity = null;
- for (Map.Entry entry : fieldsMap.entrySet())
- {
- Object val = this.getCellValue(row, entry.getKey());
-
- // 濡傛灉涓嶅瓨鍦ㄥ疄渚嬪垯鏂板缓.
- entity = (entity == null ? clazz.newInstance() : entity);
- // 浠巑ap涓緱鍒板搴斿垪鐨刦ield.
- Field field = fieldsMap.get(entry.getKey());
- // 鍙栧緱绫诲瀷,骞舵牴鎹璞＄被鍨嬭缃.
- Class fieldType = field.getType();
- if (String.class == fieldType)
- {
- String s = Convert.toStr(val);
- if (StringUtils.endsWith(s, ".0"))
- {
- val = StringUtils.substringBefore(s, ".0");
- }
- else
- {
- val = Convert.toStr(val);
- }
- }
- else if ((Integer.TYPE == fieldType) || (Integer.class == fieldType))
- {
- val = Convert.toInt(val);
- }
- else if ((Long.TYPE == fieldType) || (Long.class == fieldType))
- {
- val = Convert.toLong(val);
- }
- else if ((Double.TYPE == fieldType) || (Double.class == fieldType))
- {
- val = Convert.toDouble(val);
- }
- else if ((Float.TYPE == fieldType) || (Float.class == fieldType))
- {
- val = Convert.toFloat(val);
- }
- else if (BigDecimal.class == fieldType)
- {
- val = Convert.toBigDecimal(val);
- }
- else if (Date.class == fieldType)
- {
- if (val instanceof String)
- {
- val = DateUtils.parseDate(val);
- }
- else if (val instanceof Double)
- {
- val = DateUtil.getJavaDate((Double) val);
- }
- }
- if (StringUtils.isNotNull(fieldType))
- {
- Excel attr = field.getAnnotation(Excel.class);
- String propertyName = field.getName();
- if (StringUtils.isNotEmpty(attr.targetAttr()))
- {
- propertyName = field.getName() + "." + attr.targetAttr();
- }
- else if (StringUtils.isNotEmpty(attr.readConverterExp()))
- {
- val = reverseByExp(String.valueOf(val), attr.readConverterExp());
- }
- ReflectUtils.invokeSetter(entity, propertyName, val);
- }
- }
- list.add(entity);
- }
- }
- return list;
- }
-
- /**
- * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
- *
- * @param list 瀵煎嚭鏁版嵁闆嗗悎
- * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
- * @return 缁撴灉
- */
- public AjaxResult exportExcel(List list, String sheetName)
- {
- this.init(list, sheetName, Type.EXPORT);
- return exportExcel();
- }
-
- /**
- * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
- *
- * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
- * @return 缁撴灉
- */
- public AjaxResult importTemplateExcel(String sheetName)
- {
- this.init(null, sheetName, Type.IMPORT);
- return exportExcel();
- }
-
- /**
- * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
- *
- * @return 缁撴灉
- */
- public AjaxResult exportExcel()
- {
- OutputStream out = null;
- try
- {
- // 鍙栧嚭涓鍏辨湁澶氬皯涓猻heet.
- double sheetNo = Math.ceil(list.size() / sheetSize);
- for (int index = 0; index <= sheetNo; index++)
- {
- createSheet(sheetNo, index);
-
- // 浜х敓涓琛
- Row row = sheet.createRow(0);
- int column = 0;
- // 鍐欏叆鍚勪釜瀛楁鐨勫垪澶村悕绉
- for (Object[] os : fields)
- {
- Excel excel = (Excel) os[1];
- this.createCell(excel, row, column++);
- }
- if (Type.EXPORT.equals(type))
- {
- fillExcelData(index, row);
- }
- }
- String filename = encodingFilename(sheetName);
- out = new FileOutputStream(getAbsoluteFile(filename));
- wb.write(out);
- return AjaxResult.success(filename);
- }
- catch (Exception e)
- {
- log.error("瀵煎嚭Excel寮傚父{}", e.getMessage());
- throw new CustomException("瀵煎嚭Excel澶辫触锛岃鑱旂郴缃戠珯绠＄悊鍛橈紒");
- }
- finally
- {
- if (wb != null)
- {
- try
- {
- wb.close();
- }
- catch (IOException e1)
- {
- e1.printStackTrace();
- }
- }
- if (out != null)
- {
- try
- {
- out.close();
- }
- catch (IOException e1)
- {
- e1.printStackTrace();
- }
- }
- }
- }
-
- /**
- * 濉厖excel鏁版嵁
- *
- * @param index 搴忓彿
- * @param row 鍗曞厓鏍艰
- */
- public void fillExcelData(int index, Row row)
- {
- int startNo = index * sheetSize;
- int endNo = Math.min(startNo + sheetSize, list.size());
- for (int i = startNo; i < endNo; i++)
- {
- row = sheet.createRow(i + 1 - startNo);
- // 寰楀埌瀵煎嚭瀵硅薄.
- T vo = (T) list.get(i);
- int column = 0;
- for (Object[] os : fields)
- {
- Field field = (Field) os[0];
- Excel excel = (Excel) os[1];
- // 璁剧疆瀹炰綋绫荤鏈夊睘鎬у彲璁块棶
- field.setAccessible(true);
- this.addCell(excel, row, vo, field, column++);
- }
- }
- }
-
- /**
- * 鍒涘缓琛ㄦ牸鏍峰紡
- *
- * @param wb 宸ヤ綔钖勫璞
- * @return 鏍峰紡鍒楄〃
- */
- private Map createStyles(Workbook wb)
- {
- // 鍐欏叆鍚勬潯璁板綍,姣忔潯璁板綍瀵瑰簲excel琛ㄤ腑鐨勪竴琛
- Map styles = new HashMap();
- CellStyle style = wb.createCellStyle();
- style.setAlignment(HorizontalAlignment.CENTER);
- style.setVerticalAlignment(VerticalAlignment.CENTER);
- style.setBorderRight(BorderStyle.THIN);
- style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
- style.setBorderLeft(BorderStyle.THIN);
- style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
- style.setBorderTop(BorderStyle.THIN);
- style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
- style.setBorderBottom(BorderStyle.THIN);
- style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
- Font dataFont = wb.createFont();
- dataFont.setFontName("Arial");
- dataFont.setFontHeightInPoints((short) 10);
- style.setFont(dataFont);
- styles.put("data", style);
-
- style = wb.createCellStyle();
- style.cloneStyleFrom(styles.get("data"));
- style.setAlignment(HorizontalAlignment.CENTER);
- style.setVerticalAlignment(VerticalAlignment.CENTER);
- style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex());
- style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
- Font headerFont = wb.createFont();
- headerFont.setFontName("Arial");
- headerFont.setFontHeightInPoints((short) 10);
- headerFont.setBold(true);
- headerFont.setColor(IndexedColors.WHITE.getIndex());
- style.setFont(headerFont);
- styles.put("header", style);
-
- return styles;
- }
-
- /**
- * 鍒涘缓鍗曞厓鏍
- */
- public Cell createCell(Excel attr, Row row, int column)
- {
- // 鍒涘缓鍒
- Cell cell = row.createCell(column);
- // 鍐欏叆鍒椾俊鎭
- cell.setCellValue(attr.name());
- setDataValidation(attr, row, column);
- cell.setCellStyle(styles.get("header"));
- return cell;
- }
-
- /**
- * 璁剧疆鍗曞厓鏍间俊鎭
- *
- * @param value 鍗曞厓鏍煎
- * @param attr 娉ㄨВ鐩稿叧
- * @param cell 鍗曞厓鏍间俊鎭
- */
- public void setCellVo(Object value, Excel attr, Cell cell)
- {
- if (ColumnType.STRING == attr.cellType())
- {
- cell.setCellType(CellType.NUMERIC);
- cell.setCellValue(StringUtils.isNull(value) ? attr.defaultValue() : value + attr.suffix());
- }
- else if (ColumnType.NUMERIC == attr.cellType())
- {
- cell.setCellType(CellType.NUMERIC);
- cell.setCellValue(Integer.parseInt(value + ""));
- }
- }
-
- /**
- * 鍒涘缓琛ㄦ牸鏍峰紡
- */
- public void setDataValidation(Excel attr, Row row, int column)
- {
- if (attr.name().indexOf("娉細") >= 0)
- {
- sheet.setColumnWidth(column, 6000);
- }
- else
- {
- // 璁剧疆鍒楀
- sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));
- row.setHeight((short) (attr.height() * 20));
- }
- // 濡傛灉璁剧疆浜嗘彁绀轰俊鎭垯榧犳爣鏀句笂鍘绘彁绀.
- if (StringUtils.isNotEmpty(attr.prompt()))
- {
- // 杩欓噷榛樿璁句簡2-101鍒楁彁绀.
- setXSSFPrompt(sheet, "", attr.prompt(), 1, 100, column, column);
- }
- // 濡傛灉璁剧疆浜哻ombo灞炴у垯鏈垪鍙兘閫夋嫨涓嶈兘杈撳叆
- if (attr.combo().length > 0)
- {
- // 杩欓噷榛樿璁句簡2-101鍒楀彧鑳介夋嫨涓嶈兘杈撳叆.
- setXSSFValidation(sheet, attr.combo(), 1, 100, column, column);
- }
- }
-
- /**
- * 娣诲姞鍗曞厓鏍
- */
- public Cell addCell(Excel attr, Row row, T vo, Field field, int column)
- {
- Cell cell = null;
- try
- {
- // 璁剧疆琛岄珮
- row.setHeight((short) (attr.height() * 20));
- // 鏍规嵁Excel涓缃儏鍐靛喅瀹氭槸鍚﹀鍑,鏈変簺鎯呭喌闇瑕佷繚鎸佷负绌,甯屾湜鐢ㄦ埛濉啓杩欎竴鍒.
- if (attr.isExport())
- {
- // 鍒涘缓cell
- cell = row.createCell(column);
- cell.setCellStyle(styles.get("data"));
-
- // 鐢ㄤ簬璇诲彇瀵硅薄涓殑灞炴
- Object value = getTargetValue(vo, field, attr);
- String dateFormat = attr.dateFormat();
- String readConverterExp = attr.readConverterExp();
- if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
- {
- cell.setCellValue(DateUtils.parseDateToStr(dateFormat, (Date) value));
- }
- else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
- {
- cell.setCellValue(convertByExp(String.valueOf(value), readConverterExp));
- }
- else
- {
- // 璁剧疆鍒楃被鍨
- setCellVo(value, attr, cell);
- }
- }
- }
- catch (Exception e)
- {
- log.error("瀵煎嚭Excel澶辫触{}", e);
- }
- return cell;
- }
-
- /**
- * 璁剧疆 POI XSSFSheet 鍗曞厓鏍兼彁绀
- *
- * @param sheet 琛ㄥ崟
- * @param promptTitle 鎻愮ず鏍囬
- * @param promptContent 鎻愮ず鍐呭
- * @param firstRow 寮濮嬭
- * @param endRow 缁撴潫琛
- * @param firstCol 寮濮嬪垪
- * @param endCol 缁撴潫鍒
- */
- public void setXSSFPrompt(Sheet sheet, String promptTitle, String promptContent, int firstRow, int endRow,
- int firstCol, int endCol)
- {
- DataValidationHelper helper = sheet.getDataValidationHelper();
- DataValidationConstraint constraint = helper.createCustomConstraint("DD1");
- CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
- DataValidation dataValidation = helper.createValidation(constraint, regions);
- dataValidation.createPromptBox(promptTitle, promptContent);
- dataValidation.setShowPromptBox(true);
- sheet.addValidationData(dataValidation);
- }
-
- /**
- * 璁剧疆鏌愪簺鍒楃殑鍊煎彧鑳借緭鍏ラ鍒剁殑鏁版嵁,鏄剧ず涓嬫媺妗.
- *
- * @param sheet 瑕佽缃殑sheet.
- * @param textlist 涓嬫媺妗嗘樉绀虹殑鍐呭
- * @param firstRow 寮濮嬭
- * @param endRow 缁撴潫琛
- * @param firstCol 寮濮嬪垪
- * @param endCol 缁撴潫鍒
- * @return 璁剧疆濂界殑sheet.
- */
- public void setXSSFValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol)
- {
- DataValidationHelper helper = sheet.getDataValidationHelper();
- // 鍔犺浇涓嬫媺鍒楄〃鍐呭
- DataValidationConstraint constraint = helper.createExplicitListConstraint(textlist);
- // 璁剧疆鏁版嵁鏈夋晥鎬у姞杞藉湪鍝釜鍗曞厓鏍间笂,鍥涗釜鍙傛暟鍒嗗埆鏄細璧峰琛屻佺粓姝㈣銆佽捣濮嬪垪銆佺粓姝㈠垪
- CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
- // 鏁版嵁鏈夋晥鎬у璞
- DataValidation dataValidation = helper.createValidation(constraint, regions);
- // 澶勭悊Excel鍏煎鎬ч棶棰
- if (dataValidation instanceof XSSFDataValidation)
- {
- dataValidation.setSuppressDropDownArrow(true);
- dataValidation.setShowErrorBox(true);
- }
- else
- {
- dataValidation.setSuppressDropDownArrow(false);
- }
-
- sheet.addValidationData(dataValidation);
- }
-
- /**
- * 瑙ｆ瀽瀵煎嚭鍊 0=鐢,1=濂,2=鏈煡
- *
- * @param propertyValue 鍙傛暟鍊
- * @param converterExp 缈昏瘧娉ㄨВ
- * @return 瑙ｆ瀽鍚庡
- * @throws Exception
- */
- public static String convertByExp(String propertyValue, String converterExp) throws Exception
- {
- try
- {
- String[] convertSource = converterExp.split(",");
- for (String item : convertSource)
- {
- String[] itemArray = item.split("=");
- if (itemArray[0].equals(propertyValue))
- {
- return itemArray[1];
- }
- }
- }
- catch (Exception e)
- {
- throw e;
- }
- return propertyValue;
- }
-
- /**
- * 鍙嶅悜瑙ｆ瀽鍊 鐢=0,濂=1,鏈煡=2
- *
- * @param propertyValue 鍙傛暟鍊
- * @param converterExp 缈昏瘧娉ㄨВ
- * @return 瑙ｆ瀽鍚庡
- * @throws Exception
- */
- public static String reverseByExp(String propertyValue, String converterExp) throws Exception
- {
- try
- {
- String[] convertSource = converterExp.split(",");
- for (String item : convertSource)
- {
- String[] itemArray = item.split("=");
- if (itemArray[1].equals(propertyValue))
- {
- return itemArray[0];
- }
- }
- }
- catch (Exception e)
- {
- throw e;
- }
- return propertyValue;
- }
-
- /**
- * 缂栫爜鏂囦欢鍚
- */
- public String encodingFilename(String filename)
- {
- filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx";
- return filename;
- }
-
- /**
- * 鑾峰彇涓嬭浇璺緞
- *
- * @param filename 鏂囦欢鍚嶇О
- */
- public String getAbsoluteFile(String filename)
- {
- String downloadPath = RuoYiConfig.getDownloadPath() + filename;
- File desc = new File(downloadPath);
- if (!desc.getParentFile().exists())
- {
- desc.getParentFile().mkdirs();
- }
- return downloadPath;
- }
-
- /**
- * 鑾峰彇bean涓殑灞炴у
- *
- * @param vo 瀹炰綋瀵硅薄
- * @param field 瀛楁
- * @param excel 娉ㄨВ
- * @return 鏈缁堢殑灞炴у
- * @throws Exception
- */
- private Object getTargetValue(T vo, Field field, Excel excel) throws Exception
- {
- Object o = field.get(vo);
- if (StringUtils.isNotEmpty(excel.targetAttr()))
- {
- String target = excel.targetAttr();
- if (target.indexOf(".") > -1)
- {
- String[] targets = target.split("[.]");
- for (String name : targets)
- {
- o = getValue(o, name);
- }
- }
- else
- {
- o = getValue(o, target);
- }
- }
- return o;
- }
-
- /**
- * 浠ョ被鐨勫睘鎬х殑get鏂规硶鏂规硶褰㈠紡鑾峰彇鍊
- *
- * @param o
- * @param name
- * @return value
- * @throws Exception
- */
- private Object getValue(Object o, String name) throws Exception
- {
- if (StringUtils.isNotEmpty(name))
- {
- Class clazz = o.getClass();
- String methodName = "get" + name.substring(0, 1).toUpperCase() + name.substring(1);
- Method method = clazz.getMethod(methodName);
- o = method.invoke(o);
- }
- return o;
- }
-
- /**
- * 寰楀埌鎵鏈夊畾涔夊瓧娈
- */
- private void createExcelField()
- {
- this.fields = new ArrayList();
- List tempFields = new ArrayList<>();
- tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
- tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
- for (Field field : tempFields)
- {
- // 鍗曟敞瑙
- if (field.isAnnotationPresent(Excel.class))
- {
- putToField(field, field.getAnnotation(Excel.class));
- }
-
- // 澶氭敞瑙
- if (field.isAnnotationPresent(Excels.class))
- {
- Excels attrs = field.getAnnotation(Excels.class);
- Excel[] excels = attrs.value();
- for (Excel excel : excels)
- {
- putToField(field, excel);
- }
- }
- }
- }
-
- /**
- * 鏀惧埌瀛楁闆嗗悎涓
- */
- private void putToField(Field field, Excel attr)
- {
- if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
- {
- this.fields.add(new Object[] { field, attr });
- }
- }
-
- /**
- * 鍒涘缓涓涓伐浣滅翱
- */
- public void createWorkbook()
- {
- this.wb = new SXSSFWorkbook(500);
- }
-
- /**
- * 鍒涘缓宸ヤ綔琛
- *
- * @param sheetNo sheet鏁伴噺
- * @param index 搴忓彿
- */
- public void createSheet(double sheetNo, int index)
- {
- this.sheet = wb.createSheet();
- this.styles = createStyles(wb);
- // 璁剧疆宸ヤ綔琛ㄧ殑鍚嶇О.
- if (sheetNo == 0)
- {
- wb.setSheetName(index, sheetName);
- }
- else
- {
- wb.setSheetName(index, sheetName + index);
- }
- }
-
- /**
- * 鑾峰彇鍗曞厓鏍煎
- *
- * @param row 鑾峰彇鐨勮
- * @param column 鑾峰彇鍗曞厓鏍煎垪鍙
- * @return 鍗曞厓鏍煎
- */
- public Object getCellValue(Row row, int column)
- {
- if (row == null)
- {
- return row;
- }
- Object val = "";
- try
- {
- Cell cell = row.getCell(column);
- if (cell != null)
- {
- if (cell.getCellTypeEnum() == CellType.NUMERIC || cell.getCellTypeEnum() == CellType.FORMULA)
- {
- val = cell.getNumericCellValue();
- if (HSSFDateUtil.isCellDateFormatted(cell))
- {
- val = DateUtil.getJavaDate((Double) val); // POI Excel 鏃ユ湡鏍煎紡杞崲
- }
- else
- {
- if ((Double) val % 1 > 0)
- {
- val = new DecimalFormat("0.00").format(val);
- }
- else
- {
- val = new DecimalFormat("0").format(val);
- }
- }
- }
- else if (cell.getCellTypeEnum() == CellType.STRING)
- {
- val = cell.getStringCellValue();
- }
- else if (cell.getCellTypeEnum() == CellType.BOOLEAN)
- {
- val = cell.getBooleanCellValue();
- }
- else if (cell.getCellTypeEnum() == CellType.ERROR)
- {
- val = cell.getErrorCellValue();
- }
-
- }
- }
- catch (Exception e)
- {
- return val;
- }
- return val;
- }
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
deleted file mode 100644
index b78e53e1..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
+++ /dev/null
@@ -1,406 +0,0 @@
-package com.ruoyi.common.utils.reflect;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Date;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.utils.DateUtils;
-
-/**
- * 鍙嶅皠宸ュ叿绫. 鎻愪緵璋冪敤getter/setter鏂规硶, 璁块棶绉佹湁鍙橀噺, 璋冪敤绉佹湁鏂规硶, 鑾峰彇娉涘瀷绫诲瀷Class, 琚獳OP杩囩殑鐪熷疄绫荤瓑宸ュ叿鍑芥暟.
- *
- * @author ruoyi
- */
-@SuppressWarnings("rawtypes")
-public class ReflectUtils
-{
- private static final String SETTER_PREFIX = "set";
-
- private static final String GETTER_PREFIX = "get";
-
- private static final String CGLIB_CLASS_SEPARATOR = "$$";
-
- private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class);
-
- /**
- * 璋冪敤Getter鏂规硶.
- * 鏀寔澶氱骇锛屽锛氬璞″悕.瀵硅薄鍚.鏂规硶
- */
- @SuppressWarnings("unchecked")
- public static E invokeGetter(Object obj, String propertyName)
- {
- Object object = obj;
- for (String name : StringUtils.split(propertyName, "."))
- {
- String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name);
- object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {});
- }
- return (E) object;
- }
-
- /**
- * 璋冪敤Setter鏂规硶, 浠呭尮閰嶆柟娉曞悕銆
- * 鏀寔澶氱骇锛屽锛氬璞″悕.瀵硅薄鍚.鏂规硶
- */
- public static void invokeSetter(Object obj, String propertyName, E value)
- {
- Object object = obj;
- String[] names = StringUtils.split(propertyName, ".");
- for (int i = 0; i < names.length; i++)
- {
- if (i < names.length - 1)
- {
- String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]);
- object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {});
- }
- else
- {
- String setterMethodName = SETTER_PREFIX + StringUtils.capitalize(names[i]);
- invokeMethodByName(object, setterMethodName, new Object[] { value });
- }
- }
- }
-
- /**
- * 鐩存帴璇诲彇瀵硅薄灞炴у, 鏃犺private/protected淇グ绗, 涓嶇粡杩噂etter鍑芥暟.
- */
- @SuppressWarnings("unchecked")
- public static E getFieldValue(final Object obj, final String fieldName)
- {
- Field field = getAccessibleField(obj, fieldName);
- if (field == null)
- {
- logger.debug("鍦 [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + fieldName + "] 瀛楁 ");
- return null;
- }
- E result = null;
- try
- {
- result = (E) field.get(obj);
- }
- catch (IllegalAccessException e)
- {
- logger.error("涓嶅彲鑳芥姏鍑虹殑寮傚父{}", e.getMessage());
- }
- return result;
- }
-
- /**
- * 鐩存帴璁剧疆瀵硅薄灞炴у, 鏃犺private/protected淇グ绗, 涓嶇粡杩噑etter鍑芥暟.
- */
- public static void setFieldValue(final Object obj, final String fieldName, final E value)
- {
- Field field = getAccessibleField(obj, fieldName);
- if (field == null)
- {
- // throw new IllegalArgumentException("鍦 [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + fieldName + "] 瀛楁 ");
- logger.debug("鍦 [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + fieldName + "] 瀛楁 ");
- return;
- }
- try
- {
- field.set(obj, value);
- }
- catch (IllegalAccessException e)
- {
- logger.error("涓嶅彲鑳芥姏鍑虹殑寮傚父: {}", e.getMessage());
- }
- }
-
- /**
- * 鐩存帴璋冪敤瀵硅薄鏂规硶, 鏃犺private/protected淇グ绗.
- * 鐢ㄤ簬涓娆℃ц皟鐢ㄧ殑鎯呭喌锛屽惁鍒欏簲浣跨敤getAccessibleMethod()鍑芥暟鑾峰緱Method鍚庡弽澶嶈皟鐢.
- * 鍚屾椂鍖归厤鏂规硶鍚+鍙傛暟绫诲瀷锛
- */
- @SuppressWarnings("unchecked")
- public static E invokeMethod(final Object obj, final String methodName, final Class[] parameterTypes,
- final Object[] args)
- {
- if (obj == null || methodName == null)
- {
- return null;
- }
- Method method = getAccessibleMethod(obj, methodName, parameterTypes);
- if (method == null)
- {
- logger.debug("鍦 [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + methodName + "] 鏂规硶 ");
- return null;
- }
- try
- {
- return (E) method.invoke(obj, args);
- }
- catch (Exception e)
- {
- String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";
- throw convertReflectionExceptionToUnchecked(msg, e);
- }
- }
-
- /**
- * 鐩存帴璋冪敤瀵硅薄鏂规硶, 鏃犺private/protected淇グ绗︼紝
- * 鐢ㄤ簬涓娆℃ц皟鐢ㄧ殑鎯呭喌锛屽惁鍒欏簲浣跨敤getAccessibleMethodByName()鍑芥暟鑾峰緱Method鍚庡弽澶嶈皟鐢.
- * 鍙尮閰嶅嚱鏁板悕锛屽鏋滄湁澶氫釜鍚屽悕鍑芥暟璋冪敤绗竴涓
- */
- @SuppressWarnings("unchecked")
- public static E invokeMethodByName(final Object obj, final String methodName, final Object[] args)
- {
- Method method = getAccessibleMethodByName(obj, methodName, args.length);
- if (method == null)
- {
- // 濡傛灉涓虹┖涓嶆姤閿欙紝鐩存帴杩斿洖绌恒
- logger.debug("鍦 [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + methodName + "] 鏂规硶 ");
- return null;
- }
- try
- {
- // 绫诲瀷杞崲锛堝皢鍙傛暟鏁版嵁绫诲瀷杞崲涓虹洰鏍囨柟娉曞弬鏁扮被鍨嬶級
- Class[] cs = method.getParameterTypes();
- for (int i = 0; i < cs.length; i++)
- {
- if (args[i] != null && !args[i].getClass().equals(cs[i]))
- {
- if (cs[i] == String.class)
- {
- args[i] = Convert.toStr(args[i]);
- if (StringUtils.endsWith((String) args[i], ".0"))
- {
- args[i] = StringUtils.substringBefore((String) args[i], ".0");
- }
- }
- else if (cs[i] == Integer.class)
- {
- args[i] = Convert.toInt(args[i]);
- }
- else if (cs[i] == Long.class)
- {
- args[i] = Convert.toLong(args[i]);
- }
- else if (cs[i] == Double.class)
- {
- args[i] = Convert.toDouble(args[i]);
- }
- else if (cs[i] == Float.class)
- {
- args[i] = Convert.toFloat(args[i]);
- }
- else if (cs[i] == Date.class)
- {
- if (args[i] instanceof String)
- {
- args[i] = DateUtils.parseDate(args[i]);
- }
- else
- {
- args[i] = DateUtil.getJavaDate((Double) args[i]);
- }
- }
- }
- }
- return (E) method.invoke(obj, args);
- }
- catch (Exception e)
- {
- String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";
- throw convertReflectionExceptionToUnchecked(msg, e);
- }
- }
-
- /**
- * 寰幆鍚戜笂杞瀷, 鑾峰彇瀵硅薄鐨凞eclaredField, 骞跺己鍒惰缃负鍙闂.
- * 濡傚悜涓婅浆鍨嬪埌Object浠嶆棤娉曟壘鍒, 杩斿洖null.
- */
- public static Field getAccessibleField(final Object obj, final String fieldName)
- {
- // 涓虹┖涓嶆姤閿欍傜洿鎺ヨ繑鍥 null
- if (obj == null)
- {
- return null;
- }
- Validate.notBlank(fieldName, "fieldName can't be blank");
- for (Class superClass = obj.getClass(); superClass != Object.class; superClass = superClass.getSuperclass())
- {
- try
- {
- Field field = superClass.getDeclaredField(fieldName);
- makeAccessible(field);
- return field;
- }
- catch (NoSuchFieldException e)
- {
- continue;
- }
- }
- return null;
- }
-
- /**
- * 寰幆鍚戜笂杞瀷, 鑾峰彇瀵硅薄鐨凞eclaredMethod,骞跺己鍒惰缃负鍙闂.
- * 濡傚悜涓婅浆鍨嬪埌Object浠嶆棤娉曟壘鍒, 杩斿洖null.
- * 鍖归厤鍑芥暟鍚+鍙傛暟绫诲瀷銆
- * 鐢ㄤ簬鏂规硶闇瑕佽澶氭璋冪敤鐨勬儏鍐. 鍏堜娇鐢ㄦ湰鍑芥暟鍏堝彇寰桵ethod,鐒跺悗璋冪敤Method.invoke(Object obj, Object... args)
- */
- public static Method getAccessibleMethod(final Object obj, final String methodName,
- final Class... parameterTypes)
- {
- // 涓虹┖涓嶆姤閿欍傜洿鎺ヨ繑鍥 null
- if (obj == null)
- {
- return null;
- }
- Validate.notBlank(methodName, "methodName can't be blank");
- for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass())
- {
- try
- {
- Method method = searchType.getDeclaredMethod(methodName, parameterTypes);
- makeAccessible(method);
- return method;
- }
- catch (NoSuchMethodException e)
- {
- continue;
- }
- }
- return null;
- }
-
- /**
- * 寰幆鍚戜笂杞瀷, 鑾峰彇瀵硅薄鐨凞eclaredMethod,骞跺己鍒惰缃负鍙闂.
- * 濡傚悜涓婅浆鍨嬪埌Object浠嶆棤娉曟壘鍒, 杩斿洖null.
- * 鍙尮閰嶅嚱鏁板悕銆
- * 鐢ㄤ簬鏂规硶闇瑕佽澶氭璋冪敤鐨勬儏鍐. 鍏堜娇鐢ㄦ湰鍑芥暟鍏堝彇寰桵ethod,鐒跺悗璋冪敤Method.invoke(Object obj, Object... args)
- */
- public static Method getAccessibleMethodByName(final Object obj, final String methodName, int argsNum)
- {
- // 涓虹┖涓嶆姤閿欍傜洿鎺ヨ繑鍥 null
- if (obj == null)
- {
- return null;
- }
- Validate.notBlank(methodName, "methodName can't be blank");
- for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass())
- {
- Method[] methods = searchType.getDeclaredMethods();
- for (Method method : methods)
- {
- if (method.getName().equals(methodName) && method.getParameterTypes().length == argsNum)
- {
- makeAccessible(method);
- return method;
- }
- }
- }
- return null;
- }
-
- /**
- * 鏀瑰彉private/protected鐨勬柟娉曚负public锛屽敖閲忎笉璋冪敤瀹為檯鏀瑰姩鐨勮鍙ワ紝閬垮厤JDK鐨凷ecurityManager鎶辨ㄣ
- */
- public static void makeAccessible(Method method)
- {
- if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers()))
- && !method.isAccessible())
- {
- method.setAccessible(true);
- }
- }
-
- /**
- * 鏀瑰彉private/protected鐨勬垚鍛樺彉閲忎负public锛屽敖閲忎笉璋冪敤瀹為檯鏀瑰姩鐨勮鍙ワ紝閬垮厤JDK鐨凷ecurityManager鎶辨ㄣ
- */
- public static void makeAccessible(Field field)
- {
- if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers())
- || Modifier.isFinal(field.getModifiers())) && !field.isAccessible())
- {
- field.setAccessible(true);
- }
- }
-
- /**
- * 閫氳繃鍙嶅皠, 鑾峰緱Class瀹氫箟涓０鏄庣殑娉涘瀷鍙傛暟鐨勭被鍨, 娉ㄦ剰娉涘瀷蹇呴』瀹氫箟鍦ㄧ埗绫诲
- * 濡傛棤娉曟壘鍒, 杩斿洖Object.class.
- */
- @SuppressWarnings("unchecked")
- public static Class getClassGenricType(final Class clazz)
- {
- return getClassGenricType(clazz, 0);
- }
-
- /**
- * 閫氳繃鍙嶅皠, 鑾峰緱Class瀹氫箟涓０鏄庣殑鐖剁被鐨勬硾鍨嬪弬鏁扮殑绫诲瀷.
- * 濡傛棤娉曟壘鍒, 杩斿洖Object.class.
- */
- public static Class getClassGenricType(final Class clazz, final int index)
- {
- Type genType = clazz.getGenericSuperclass();
-
- if (!(genType instanceof ParameterizedType))
- {
- logger.debug(clazz.getSimpleName() + "'s superclass not ParameterizedType");
- return Object.class;
- }
-
- Type[] params = ((ParameterizedType) genType).getActualTypeArguments();
-
- if (index >= params.length || index < 0)
- {
- logger.debug("Index: " + index + ", Size of " + clazz.getSimpleName() + "'s Parameterized Type: "
- + params.length);
- return Object.class;
- }
- if (!(params[index] instanceof Class))
- {
- logger.debug(clazz.getSimpleName() + " not set the actual class on superclass generic parameter");
- return Object.class;
- }
-
- return (Class) params[index];
- }
-
- public static Class getUserClass(Object instance)
- {
- if (instance == null)
- {
- throw new RuntimeException("Instance must not be null");
- }
- Class clazz = instance.getClass();
- if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR))
- {
- Class superClass = clazz.getSuperclass();
- if (superClass != null && !Object.class.equals(superClass))
- {
- return superClass;
- }
- }
- return clazz;
-
- }
-
- /**
- * 灏嗗弽灏勬椂鐨刢hecked exception杞崲涓簎nchecked exception.
- */
- public static RuntimeException convertReflectionExceptionToUnchecked(String msg, Exception e)
- {
- if (e instanceof IllegalAccessException || e instanceof IllegalArgumentException
- || e instanceof NoSuchMethodException)
- {
- return new IllegalArgumentException(msg, e);
- }
- else if (e instanceof InvocationTargetException)
- {
- return new RuntimeException(msg, ((InvocationTargetException) e).getTargetException());
- }
- return new RuntimeException(msg, e);
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/security/Md5Utils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/security/Md5Utils.java
deleted file mode 100644
index 40e80304..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/security/Md5Utils.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.ruoyi.common.utils.security;
-
-import java.security.MessageDigest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Md5鍔犲瘑鏂规硶
- *
- * @author ruoyi
- */
-public class Md5Utils
-{
- private static final Logger log = LoggerFactory.getLogger(Md5Utils.class);
-
- private static byte[] md5(String s)
- {
- MessageDigest algorithm;
- try
- {
- algorithm = MessageDigest.getInstance("MD5");
- algorithm.reset();
- algorithm.update(s.getBytes("UTF-8"));
- byte[] messageDigest = algorithm.digest();
- return messageDigest;
- }
- catch (Exception e)
- {
- log.error("MD5 Error...", e);
- }
- return null;
- }
-
- private static final String toHex(byte hash[])
- {
- if (hash == null)
- {
- return null;
- }
- StringBuffer buf = new StringBuffer(hash.length * 2);
- int i;
-
- for (i = 0; i < hash.length; i++)
- {
- if ((hash[i] & 0xff) < 0x10)
- {
- buf.append("0");
- }
- buf.append(Long.toString(hash[i] & 0xff, 16));
- }
- return buf.toString();
- }
-
- public static String hash(String s)
- {
- try
- {
- return new String(toHex(md5(s)).getBytes("UTF-8"), "UTF-8");
- }
- catch (Exception e)
- {
- log.error("not supported charset...{}", e);
- return s;
- }
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/sign/Base64.java b/ruoyi/src/main/java/com/ruoyi/common/utils/sign/Base64.java
deleted file mode 100644
index f2c1bfe0..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/sign/Base64.java
+++ /dev/null
@@ -1,291 +0,0 @@
-package com.ruoyi.common.utils.sign;
-
-/**
- * Base64宸ュ叿绫
- *
- * @author ruoyi
- */
-public final class Base64
-{
- static private final int BASELENGTH = 128;
- static private final int LOOKUPLENGTH = 64;
- static private final int TWENTYFOURBITGROUP = 24;
- static private final int EIGHTBIT = 8;
- static private final int SIXTEENBIT = 16;
- static private final int FOURBYTE = 4;
- static private final int SIGN = -128;
- static private final char PAD = '=';
- static final private byte[] base64Alphabet = new byte[BASELENGTH];
- static final private char[] lookUpBase64Alphabet = new char[LOOKUPLENGTH];
-
- static
- {
- for (int i = 0; i < BASELENGTH; ++i)
- {
- base64Alphabet[i] = -1;
- }
- for (int i = 'Z'; i >= 'A'; i--)
- {
- base64Alphabet[i] = (byte) (i - 'A');
- }
- for (int i = 'z'; i >= 'a'; i--)
- {
- base64Alphabet[i] = (byte) (i - 'a' + 26);
- }
-
- for (int i = '9'; i >= '0'; i--)
- {
- base64Alphabet[i] = (byte) (i - '0' + 52);
- }
-
- base64Alphabet['+'] = 62;
- base64Alphabet['/'] = 63;
-
- for (int i = 0; i <= 25; i++)
- {
- lookUpBase64Alphabet[i] = (char) ('A' + i);
- }
-
- for (int i = 26, j = 0; i <= 51; i++, j++)
- {
- lookUpBase64Alphabet[i] = (char) ('a' + j);
- }
-
- for (int i = 52, j = 0; i <= 61; i++, j++)
- {
- lookUpBase64Alphabet[i] = (char) ('0' + j);
- }
- lookUpBase64Alphabet[62] = (char) '+';
- lookUpBase64Alphabet[63] = (char) '/';
- }
-
- private static boolean isWhiteSpace(char octect)
- {
- return (octect == 0x20 || octect == 0xd || octect == 0xa || octect == 0x9);
- }
-
- private static boolean isPad(char octect)
- {
- return (octect == PAD);
- }
-
- private static boolean isData(char octect)
- {
- return (octect < BASELENGTH && base64Alphabet[octect] != -1);
- }
-
- /**
- * Encodes hex octects into Base64
- *
- * @param binaryData Array containing binaryData
- * @return Encoded Base64 array
- */
- public static String encode(byte[] binaryData)
- {
- if (binaryData == null)
- {
- return null;
- }
-
- int lengthDataBits = binaryData.length * EIGHTBIT;
- if (lengthDataBits == 0)
- {
- return "";
- }
-
- int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP;
- int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP;
- int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1 : numberTriplets;
- char encodedData[] = null;
-
- encodedData = new char[numberQuartet * 4];
-
- byte k = 0, l = 0, b1 = 0, b2 = 0, b3 = 0;
-
- int encodedIndex = 0;
- int dataIndex = 0;
-
- for (int i = 0; i < numberTriplets; i++)
- {
- b1 = binaryData[dataIndex++];
- b2 = binaryData[dataIndex++];
- b3 = binaryData[dataIndex++];
-
- l = (byte) (b2 & 0x0f);
- k = (byte) (b1 & 0x03);
-
- byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
- byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
- byte val3 = ((b3 & SIGN) == 0) ? (byte) (b3 >> 6) : (byte) ((b3) >> 6 ^ 0xfc);
-
- encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
- encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)];
- encodedData[encodedIndex++] = lookUpBase64Alphabet[(l << 2) | val3];
- encodedData[encodedIndex++] = lookUpBase64Alphabet[b3 & 0x3f];
- }
-
- // form integral number of 6-bit groups
- if (fewerThan24bits == EIGHTBIT)
- {
- b1 = binaryData[dataIndex];
- k = (byte) (b1 & 0x03);
- byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
- encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
- encodedData[encodedIndex++] = lookUpBase64Alphabet[k << 4];
- encodedData[encodedIndex++] = PAD;
- encodedData[encodedIndex++] = PAD;
- }
- else if (fewerThan24bits == SIXTEENBIT)
- {
- b1 = binaryData[dataIndex];
- b2 = binaryData[dataIndex + 1];
- l = (byte) (b2 & 0x0f);
- k = (byte) (b1 & 0x03);
-
- byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
- byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
-
- encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
- encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)];
- encodedData[encodedIndex++] = lookUpBase64Alphabet[l << 2];
- encodedData[encodedIndex++] = PAD;
- }
- return new String(encodedData);
- }
-
- /**
- * Decodes Base64 data into octects
- *
- * @param encoded string containing Base64 data
- * @return Array containind decoded data.
- */
- public static byte[] decode(String encoded)
- {
- if (encoded == null)
- {
- return null;
- }
-
- char[] base64Data = encoded.toCharArray();
- // remove white spaces
- int len = removeWhiteSpace(base64Data);
-
- if (len % FOURBYTE != 0)
- {
- return null;// should be divisible by four
- }
-
- int numberQuadruple = (len / FOURBYTE);
-
- if (numberQuadruple == 0)
- {
- return new byte[0];
- }
-
- byte decodedData[] = null;
- byte b1 = 0, b2 = 0, b3 = 0, b4 = 0;
- char d1 = 0, d2 = 0, d3 = 0, d4 = 0;
-
- int i = 0;
- int encodedIndex = 0;
- int dataIndex = 0;
- decodedData = new byte[(numberQuadruple) * 3];
-
- for (; i < numberQuadruple - 1; i++)
- {
-
- if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++]))
- || !isData((d3 = base64Data[dataIndex++])) || !isData((d4 = base64Data[dataIndex++])))
- {
- return null;
- } // if found "no data" just return null
-
- b1 = base64Alphabet[d1];
- b2 = base64Alphabet[d2];
- b3 = base64Alphabet[d3];
- b4 = base64Alphabet[d4];
-
- decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
- decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
- decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
- }
-
- if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++])))
- {
- return null;// if found "no data" just return null
- }
-
- b1 = base64Alphabet[d1];
- b2 = base64Alphabet[d2];
-
- d3 = base64Data[dataIndex++];
- d4 = base64Data[dataIndex++];
- if (!isData((d3)) || !isData((d4)))
- {// Check if they are PAD characters
- if (isPad(d3) && isPad(d4))
- {
- if ((b2 & 0xf) != 0)// last 4 bits should be zero
- {
- return null;
- }
- byte[] tmp = new byte[i * 3 + 1];
- System.arraycopy(decodedData, 0, tmp, 0, i * 3);
- tmp[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
- return tmp;
- }
- else if (!isPad(d3) && isPad(d4))
- {
- b3 = base64Alphabet[d3];
- if ((b3 & 0x3) != 0)// last 2 bits should be zero
- {
- return null;
- }
- byte[] tmp = new byte[i * 3 + 2];
- System.arraycopy(decodedData, 0, tmp, 0, i * 3);
- tmp[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
- tmp[encodedIndex] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
- return tmp;
- }
- else
- {
- return null;
- }
- }
- else
- { // No PAD e.g 3cQl
- b3 = base64Alphabet[d3];
- b4 = base64Alphabet[d4];
- decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
- decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
- decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
-
- }
- return decodedData;
- }
-
- /**
- * remove WhiteSpace from MIME containing encoded Base64 data.
- *
- * @param data the byte array of base64 data (with WS)
- * @return the new length
- */
- private static int removeWhiteSpace(char[] data)
- {
- if (data == null)
- {
- return 0;
- }
-
- // count characters that's not whitespace
- int newSize = 0;
- int len = data.length;
- for (int i = 0; i < len; i++)
- {
- if (!isWhiteSpace(data[i]))
- {
- data[newSize++] = data[i];
- }
- }
- return newSize;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
deleted file mode 100644
index e0311595..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.ruoyi.common.utils.spring;
-
-import org.springframework.aop.framework.AopContext;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.stereotype.Component;
-
-/**
- * spring宸ュ叿绫 鏂逛究鍦ㄩ潪spring绠＄悊鐜涓幏鍙朾ean
- *
- * @author ruoyi
- */
-@Component
-public final class SpringUtils implements BeanFactoryPostProcessor
-{
- /** Spring搴旂敤涓婁笅鏂囩幆澧 */
- private static ConfigurableListableBeanFactory beanFactory;
-
- @Override
- public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
- {
- SpringUtils.beanFactory = beanFactory;
- }
-
- /**
- * 鑾峰彇瀵硅薄
- *
- * @param name
- * @return Object 涓涓互鎵缁欏悕瀛楁敞鍐岀殑bean鐨勫疄渚
- * @throws org.springframework.beans.BeansException
- *
- */
- @SuppressWarnings("unchecked")
- public static T getBean(String name) throws BeansException
- {
- return (T) beanFactory.getBean(name);
- }
-
- /**
- * 鑾峰彇绫诲瀷涓簉equiredType鐨勫璞
- *
- * @param clz
- * @return
- * @throws org.springframework.beans.BeansException
- *
- */
- public static T getBean(Class clz) throws BeansException
- {
- T result = (T) beanFactory.getBean(clz);
- return result;
- }
-
- /**
- * 濡傛灉BeanFactory鍖呭惈涓涓笌鎵缁欏悕绉板尮閰嶇殑bean瀹氫箟锛屽垯杩斿洖true
- *
- * @param name
- * @return boolean
- */
- public static boolean containsBean(String name)
- {
- return beanFactory.containsBean(name);
- }
-
- /**
- * 鍒ゆ柇浠ョ粰瀹氬悕瀛楁敞鍐岀殑bean瀹氫箟鏄竴涓猻ingleton杩樻槸涓涓猵rototype銆 濡傛灉涓庣粰瀹氬悕瀛楃浉搴旂殑bean瀹氫箟娌℃湁琚壘鍒帮紝灏嗕細鎶涘嚭涓涓紓甯革紙NoSuchBeanDefinitionException锛
- *
- * @param name
- * @return boolean
- * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
- *
- */
- public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException
- {
- return beanFactory.isSingleton(name);
- }
-
- /**
- * @param name
- * @return Class 娉ㄥ唽瀵硅薄鐨勭被鍨
- * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
- *
- */
- public static Class getType(String name) throws NoSuchBeanDefinitionException
- {
- return beanFactory.getType(name);
- }
-
- /**
- * 濡傛灉缁欏畾鐨刡ean鍚嶅瓧鍦╞ean瀹氫箟涓湁鍒悕锛屽垯杩斿洖杩欎簺鍒悕
- *
- * @param name
- * @return
- * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
- *
- */
- public static String[] getAliases(String name) throws NoSuchBeanDefinitionException
- {
- return beanFactory.getAliases(name);
- }
-
- /**
- * 鑾峰彇aop浠ｇ悊瀵硅薄
- *
- * @param invoker
- * @return
- */
- @SuppressWarnings("unchecked")
- public static T getAopProxy(T invoker)
- {
- return (T) AopContext.currentProxy();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/ruoyi/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
deleted file mode 100644
index b8aeaa15..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.ruoyi.common.utils.sql;
-
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * sql鎿嶄綔宸ュ叿绫
- *
- * @author ruoyi
- */
-public class SqlUtil
-{
- /**
- * 浠呮敮鎸佸瓧姣嶃佹暟瀛椼佷笅鍒掔嚎銆佺┖鏍笺侀楀彿锛堟敮鎸佸涓瓧娈垫帓搴忥級
- */
- public static String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,]+";
-
- /**
- * 妫鏌ュ瓧绗︼紝闃叉娉ㄥ叆缁曡繃
- */
- public static String escapeOrderBySql(String value)
- {
- if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value))
- {
- return StringUtils.EMPTY;
- }
- return value;
- }
-
- /**
- * 楠岃瘉 order by 璇硶鏄惁绗﹀悎瑙勮寖
- */
- public static boolean isValidOrderBySql(String value)
- {
- return value.matches(SQL_PATTERN);
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/text/CharsetKit.java b/ruoyi/src/main/java/com/ruoyi/common/utils/text/CharsetKit.java
deleted file mode 100644
index f273cf75..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/text/CharsetKit.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.ruoyi.common.utils.text;
-
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * 瀛楃闆嗗伐鍏风被
- *
- * @author ruoyi
- *
- */
-public class CharsetKit
-{
- /** ISO-8859-1 */
- public static final String ISO_8859_1 = "ISO-8859-1";
- /** UTF-8 */
- public static final String UTF_8 = "UTF-8";
- /** GBK */
- public static final String GBK = "GBK";
-
- /** ISO-8859-1 */
- public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
- /** UTF-8 */
- public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
- /** GBK */
- public static final Charset CHARSET_GBK = Charset.forName(GBK);
-
- /**
- * 杞崲涓篊harset瀵硅薄
- *
- * @param charset 瀛楃闆嗭紝涓虹┖鍒欒繑鍥為粯璁ゅ瓧绗﹂泦
- * @return Charset
- */
- public static Charset charset(String charset)
- {
- return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
- }
-
- /**
- * 杞崲瀛楃涓茬殑瀛楃闆嗙紪鐮
- *
- * @param source 瀛楃涓
- * @param srcCharset 婧愬瓧绗﹂泦锛岄粯璁SO-8859-1
- * @param destCharset 鐩爣瀛楃闆嗭紝榛樿UTF-8
- * @return 杞崲鍚庣殑瀛楃闆
- */
- public static String convert(String source, String srcCharset, String destCharset)
- {
- return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
- }
-
- /**
- * 杞崲瀛楃涓茬殑瀛楃闆嗙紪鐮
- *
- * @param source 瀛楃涓
- * @param srcCharset 婧愬瓧绗﹂泦锛岄粯璁SO-8859-1
- * @param destCharset 鐩爣瀛楃闆嗭紝榛樿UTF-8
- * @return 杞崲鍚庣殑瀛楃闆
- */
- public static String convert(String source, Charset srcCharset, Charset destCharset)
- {
- if (null == srcCharset)
- {
- srcCharset = StandardCharsets.ISO_8859_1;
- }
-
- if (null == destCharset)
- {
- srcCharset = StandardCharsets.UTF_8;
- }
-
- if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))
- {
- return source;
- }
- return new String(source.getBytes(srcCharset), destCharset);
- }
-
- /**
- * @return 绯荤粺瀛楃闆嗙紪鐮
- */
- public static String systemCharset()
- {
- return Charset.defaultCharset().name();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/text/Convert.java b/ruoyi/src/main/java/com/ruoyi/common/utils/text/Convert.java
deleted file mode 100644
index a9e2f218..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/text/Convert.java
+++ /dev/null
@@ -1,999 +0,0 @@
-package com.ruoyi.common.utils.text;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.text.NumberFormat;
-import java.util.Set;
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * 绫诲瀷杞崲鍣
- *
- * @author ruoyi
- */
-public class Convert
-{
- /**
- * 杞崲涓哄瓧绗︿覆
- * 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static String toStr(Object value, String defaultValue)
- {
- if (null == value)
- {
- return defaultValue;
- }
- if (value instanceof String)
- {
- return (String) value;
- }
- return value.toString();
- }
-
- /**
- * 杞崲涓哄瓧绗︿覆
- * 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static String toStr(Object value)
- {
- return toStr(value, null);
- }
-
- /**
- * 杞崲涓哄瓧绗
- * 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static Character toChar(Object value, Character defaultValue)
- {
- if (null == value)
- {
- return defaultValue;
- }
- if (value instanceof Character)
- {
- return (Character) value;
- }
-
- final String valueStr = toStr(value, null);
- return StringUtils.isEmpty(valueStr) ? defaultValue : valueStr.charAt(0);
- }
-
- /**
- * 杞崲涓哄瓧绗
- * 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Character toChar(Object value)
- {
- return toChar(value, null);
- }
-
- /**
- * 杞崲涓篵yte
- * 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static Byte toByte(Object value, Byte defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (value instanceof Byte)
- {
- return (Byte) value;
- }
- if (value instanceof Number)
- {
- return ((Number) value).byteValue();
- }
- final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- try
- {
- return Byte.parseByte(valueStr);
- }
- catch (Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓篵yte
- * 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Byte toByte(Object value)
- {
- return toByte(value, null);
- }
-
- /**
- * 杞崲涓篠hort
- * 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static Short toShort(Object value, Short defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (value instanceof Short)
- {
- return (Short) value;
- }
- if (value instanceof Number)
- {
- return ((Number) value).shortValue();
- }
- final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- try
- {
- return Short.parseShort(valueStr.trim());
- }
- catch (Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓篠hort
- * 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Short toShort(Object value)
- {
- return toShort(value, null);
- }
-
- /**
- * 杞崲涓篘umber
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static Number toNumber(Object value, Number defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (value instanceof Number)
- {
- return (Number) value;
- }
- final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- try
- {
- return NumberFormat.getInstance().parse(valueStr);
- }
- catch (Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓篘umber
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Number toNumber(Object value)
- {
- return toNumber(value, null);
- }
-
- /**
- * 杞崲涓篿nt
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static Integer toInt(Object value, Integer defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (value instanceof Integer)
- {
- return (Integer) value;
- }
- if (value instanceof Number)
- {
- return ((Number) value).intValue();
- }
- final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- try
- {
- return Integer.parseInt(valueStr.trim());
- }
- catch (Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓篿nt
- * 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Integer toInt(Object value)
- {
- return toInt(value, null);
- }
-
- /**
- * 杞崲涓篒nteger鏁扮粍
- *
- * @param str 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Integer[] toIntArray(String str)
- {
- return toIntArray(",", str);
- }
-
- /**
- * 杞崲涓篖ong鏁扮粍
- *
- * @param str 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Long[] toLongArray(String str)
- {
- return toLongArray(",", str);
- }
-
- /**
- * 杞崲涓篒nteger鏁扮粍
- *
- * @param split 鍒嗛殧绗
- * @param split 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Integer[] toIntArray(String split, String str)
- {
- if (StringUtils.isEmpty(str))
- {
- return new Integer[] {};
- }
- String[] arr = str.split(split);
- final Integer[] ints = new Integer[arr.length];
- for (int i = 0; i < arr.length; i++)
- {
- final Integer v = toInt(arr[i], 0);
- ints[i] = v;
- }
- return ints;
- }
-
- /**
- * 杞崲涓篖ong鏁扮粍
- *
- * @param split 鍒嗛殧绗
- * @param str 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Long[] toLongArray(String split, String str)
- {
- if (StringUtils.isEmpty(str))
- {
- return new Long[] {};
- }
- String[] arr = str.split(split);
- final Long[] longs = new Long[arr.length];
- for (int i = 0; i < arr.length; i++)
- {
- final Long v = toLong(arr[i], null);
- longs[i] = v;
- }
- return longs;
- }
-
- /**
- * 杞崲涓篠tring鏁扮粍
- *
- * @param str 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static String[] toStrArray(String str)
- {
- return toStrArray(",", str);
- }
-
- /**
- * 杞崲涓篠tring鏁扮粍
- *
- * @param split 鍒嗛殧绗
- * @param split 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static String[] toStrArray(String split, String str)
- {
- return str.split(split);
- }
-
- /**
- * 杞崲涓簂ong
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static Long toLong(Object value, Long defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (value instanceof Long)
- {
- return (Long) value;
- }
- if (value instanceof Number)
- {
- return ((Number) value).longValue();
- }
- final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- try
- {
- // 鏀寔绉戝璁℃暟娉
- return new BigDecimal(valueStr.trim()).longValue();
- }
- catch (Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓簂ong
- * 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Long toLong(Object value)
- {
- return toLong(value, null);
- }
-
- /**
- * 杞崲涓篸ouble
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static Double toDouble(Object value, Double defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (value instanceof Double)
- {
- return (Double) value;
- }
- if (value instanceof Number)
- {
- return ((Number) value).doubleValue();
- }
- final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- try
- {
- // 鏀寔绉戝璁℃暟娉
- return new BigDecimal(valueStr.trim()).doubleValue();
- }
- catch (Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓篸ouble
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Double toDouble(Object value)
- {
- return toDouble(value, null);
- }
-
- /**
- * 杞崲涓篎loat
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static Float toFloat(Object value, Float defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (value instanceof Float)
- {
- return (Float) value;
- }
- if (value instanceof Number)
- {
- return ((Number) value).floatValue();
- }
- final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- try
- {
- return Float.parseFloat(valueStr.trim());
- }
- catch (Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓篎loat
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Float toFloat(Object value)
- {
- return toFloat(value, null);
- }
-
- /**
- * 杞崲涓篵oolean
- * String鏀寔鐨勫间负锛歵rue銆乫alse銆亂es銆乷k銆乶o锛1,0 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static Boolean toBool(Object value, Boolean defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (value instanceof Boolean)
- {
- return (Boolean) value;
- }
- String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- valueStr = valueStr.trim().toLowerCase();
- switch (valueStr)
- {
- case "true":
- return true;
- case "false":
- return false;
- case "yes":
- return true;
- case "ok":
- return true;
- case "no":
- return false;
- case "1":
- return true;
- case "0":
- return false;
- default:
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓篵oolean
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static Boolean toBool(Object value)
- {
- return toBool(value, null);
- }
-
- /**
- * 杞崲涓篍num瀵硅薄
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- *
- * @param clazz Enum鐨凜lass
- * @param value 鍊
- * @param defaultValue 榛樿鍊
- * @return Enum
- */
- public static > E toEnum(Class clazz, Object value, E defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (clazz.isAssignableFrom(value.getClass()))
- {
- @SuppressWarnings("unchecked")
- E myE = (E) value;
- return myE;
- }
- final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- try
- {
- return Enum.valueOf(clazz, valueStr);
- }
- catch (Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓篍num瀵硅薄
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- *
- * @param clazz Enum鐨凜lass
- * @param value 鍊
- * @return Enum
- */
- public static > E toEnum(Class clazz, Object value)
- {
- return toEnum(clazz, value, null);
- }
-
- /**
- * 杞崲涓築igInteger
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static BigInteger toBigInteger(Object value, BigInteger defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (value instanceof BigInteger)
- {
- return (BigInteger) value;
- }
- if (value instanceof Long)
- {
- return BigInteger.valueOf((Long) value);
- }
- final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- try
- {
- return new BigInteger(valueStr);
- }
- catch (Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓築igInteger
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static BigInteger toBigInteger(Object value)
- {
- return toBigInteger(value, null);
- }
-
- /**
- * 杞崲涓築igDecimal
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊
- * @return 缁撴灉
- */
- public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue)
- {
- if (value == null)
- {
- return defaultValue;
- }
- if (value instanceof BigDecimal)
- {
- return (BigDecimal) value;
- }
- if (value instanceof Long)
- {
- return new BigDecimal((Long) value);
- }
- if (value instanceof Double)
- {
- return new BigDecimal((Double) value);
- }
- if (value instanceof Integer)
- {
- return new BigDecimal((Integer) value);
- }
- final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
- return defaultValue;
- }
- try
- {
- return new BigDecimal(valueStr);
- }
- catch (Exception e)
- {
- return defaultValue;
- }
- }
-
- /**
- * 杞崲涓築igDecimal
- * 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * 杞崲澶辫触涓嶄細鎶ラ敊
- *
- * @param value 琚浆鎹㈢殑鍊
- * @return 缁撴灉
- */
- public static BigDecimal toBigDecimal(Object value)
- {
- return toBigDecimal(value, null);
- }
-
- /**
- * 灏嗗璞¤浆涓哄瓧绗︿覆
- * 1銆丅yte鏁扮粍鍜孊yteBuffer浼氳杞崲涓哄搴斿瓧绗︿覆鐨勬暟缁 2銆佸璞℃暟缁勪細璋冪敤Arrays.toString鏂规硶
- *
- * @param obj 瀵硅薄
- * @return 瀛楃涓
- */
- public static String utf8Str(Object obj)
- {
- return str(obj, CharsetKit.CHARSET_UTF_8);
- }
-
- /**
- * 灏嗗璞¤浆涓哄瓧绗︿覆
- * 1銆丅yte鏁扮粍鍜孊yteBuffer浼氳杞崲涓哄搴斿瓧绗︿覆鐨勬暟缁 2銆佸璞℃暟缁勪細璋冪敤Arrays.toString鏂规硶
- *
- * @param obj 瀵硅薄
- * @param charsetName 瀛楃闆
- * @return 瀛楃涓
- */
- public static String str(Object obj, String charsetName)
- {
- return str(obj, Charset.forName(charsetName));
- }
-
- /**
- * 灏嗗璞¤浆涓哄瓧绗︿覆
- * 1銆丅yte鏁扮粍鍜孊yteBuffer浼氳杞崲涓哄搴斿瓧绗︿覆鐨勬暟缁 2銆佸璞℃暟缁勪細璋冪敤Arrays.toString鏂规硶
- *
- * @param obj 瀵硅薄
- * @param charset 瀛楃闆
- * @return 瀛楃涓
- */
- public static String str(Object obj, Charset charset)
- {
- if (null == obj)
- {
- return null;
- }
-
- if (obj instanceof String)
- {
- return (String) obj;
- }
- else if (obj instanceof byte[] || obj instanceof Byte[])
- {
- return str((Byte[]) obj, charset);
- }
- else if (obj instanceof ByteBuffer)
- {
- return str((ByteBuffer) obj, charset);
- }
- return obj.toString();
- }
-
- /**
- * 灏哹yte鏁扮粍杞负瀛楃涓
- *
- * @param bytes byte鏁扮粍
- * @param charset 瀛楃闆
- * @return 瀛楃涓
- */
- public static String str(byte[] bytes, String charset)
- {
- return str(bytes, StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset));
- }
-
- /**
- * 瑙ｇ爜瀛楄妭鐮
- *
- * @param data 瀛楃涓
- * @param charset 瀛楃闆嗭紝濡傛灉姝ゅ瓧娈典负绌猴紝鍒欒В鐮佺殑缁撴灉鍙栧喅浜庡钩鍙
- * @return 瑙ｇ爜鍚庣殑瀛楃涓
- */
- public static String str(byte[] data, Charset charset)
- {
- if (data == null)
- {
- return null;
- }
-
- if (null == charset)
- {
- return new String(data);
- }
- return new String(data, charset);
- }
-
- /**
- * 灏嗙紪鐮佺殑byteBuffer鏁版嵁杞崲涓哄瓧绗︿覆
- *
- * @param data 鏁版嵁
- * @param charset 瀛楃闆嗭紝濡傛灉涓虹┖浣跨敤褰撳墠绯荤粺瀛楃闆
- * @return 瀛楃涓
- */
- public static String str(ByteBuffer data, String charset)
- {
- if (data == null)
- {
- return null;
- }
-
- return str(data, Charset.forName(charset));
- }
-
- /**
- * 灏嗙紪鐮佺殑byteBuffer鏁版嵁杞崲涓哄瓧绗︿覆
- *
- * @param data 鏁版嵁
- * @param charset 瀛楃闆嗭紝濡傛灉涓虹┖浣跨敤褰撳墠绯荤粺瀛楃闆
- * @return 瀛楃涓
- */
- public static String str(ByteBuffer data, Charset charset)
- {
- if (null == charset)
- {
- charset = Charset.defaultCharset();
- }
- return charset.decode(data).toString();
- }
-
- // ----------------------------------------------------------------------- 鍏ㄨ鍗婅杞崲
- /**
- * 鍗婅杞叏瑙
- *
- * @param input String.
- * @return 鍏ㄨ瀛楃涓.
- */
- public static String toSBC(String input)
- {
- return toSBC(input, null);
- }
-
- /**
- * 鍗婅杞叏瑙
- *
- * @param input String
- * @param notConvertSet 涓嶆浛鎹㈢殑瀛楃闆嗗悎
- * @return 鍏ㄨ瀛楃涓.
- */
- public static String toSBC(String input, Set notConvertSet)
- {
- char c[] = input.toCharArray();
- for (int i = 0; i < c.length; i++)
- {
- if (null != notConvertSet && notConvertSet.contains(c[i]))
- {
- // 璺宠繃涓嶆浛鎹㈢殑瀛楃
- continue;
- }
-
- if (c[i] == ' ')
- {
- c[i] = '\u3000';
- }
- else if (c[i] < '\177')
- {
- c[i] = (char) (c[i] + 65248);
-
- }
- }
- return new String(c);
- }
-
- /**
- * 鍏ㄨ杞崐瑙
- *
- * @param input String.
- * @return 鍗婅瀛楃涓
- */
- public static String toDBC(String input)
- {
- return toDBC(input, null);
- }
-
- /**
- * 鏇挎崲鍏ㄨ涓哄崐瑙
- *
- * @param text 鏂囨湰
- * @param notConvertSet 涓嶆浛鎹㈢殑瀛楃闆嗗悎
- * @return 鏇挎崲鍚庣殑瀛楃
- */
- public static String toDBC(String text, Set notConvertSet)
- {
- char c[] = text.toCharArray();
- for (int i = 0; i < c.length; i++)
- {
- if (null != notConvertSet && notConvertSet.contains(c[i]))
- {
- // 璺宠繃涓嶆浛鎹㈢殑瀛楃
- continue;
- }
-
- if (c[i] == '\u3000')
- {
- c[i] = ' ';
- }
- else if (c[i] > '\uFF00' && c[i] < '\uFF5F')
- {
- c[i] = (char) (c[i] - 65248);
- }
- }
- String returnString = new String(c);
-
- return returnString;
- }
-
- /**
- * 鏁板瓧閲戦澶у啓杞崲 鍏堝啓涓畬鏁寸殑鐒跺悗灏嗗闆舵嬀鏇挎崲鎴愰浂
- *
- * @param n 鏁板瓧
- * @return 涓枃澶у啓鏁板瓧
- */
- public static String digitUppercase(double n)
- {
- String[] fraction = { "瑙", "鍒" };
- String[] digit = { "闆", "澹", "璐", "鍙", "鑲", "浼", "闄", "鏌", "鎹", "鐜" };
- String[][] unit = { { "鍏", "涓", "浜" }, { "", "鎷", "浣", "浠" } };
-
- String head = n < 0 ? "璐" : "";
- n = Math.abs(n);
-
- String s = "";
- for (int i = 0; i < fraction.length; i++)
- {
- s += (digit[(int) (Math.floor(n * 10 * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(闆.)+", "");
- }
- if (s.length() < 1)
- {
- s = "鏁";
- }
- int integerPart = (int) Math.floor(n);
-
- for (int i = 0; i < unit[0].length && integerPart > 0; i++)
- {
- String p = "";
- for (int j = 0; j < unit[1].length && n > 0; j++)
- {
- p = digit[integerPart % 10] + unit[1][j] + p;
- integerPart = integerPart / 10;
- }
- s = p.replaceAll("(闆.)*闆$", "").replaceAll("^$", "闆") + unit[0][i] + s;
- }
- return head + s.replaceAll("(闆.)*闆跺厓", "鍏").replaceFirst("(闆.)+", "").replaceAll("(闆.)+", "闆").replaceAll("^鏁$", "闆跺厓鏁");
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/text/StrFormatter.java b/ruoyi/src/main/java/com/ruoyi/common/utils/text/StrFormatter.java
deleted file mode 100644
index d376bc5b..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/text/StrFormatter.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.ruoyi.common.utils.text;
-
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * 瀛楃涓叉牸寮忓寲
- *
- * @author ruoyi
- */
-public class StrFormatter
-{
- public static final String EMPTY_JSON = "{}";
- public static final char C_BACKSLASH = '\\';
- public static final char C_DELIM_START = '{';
- public static final char C_DELIM_END = '}';
-
- /**
- * 鏍煎紡鍖栧瓧绗︿覆
- * 姝ゆ柟娉曞彧鏄畝鍗曞皢鍗犱綅绗 {} 鎸夌収椤哄簭鏇挎崲涓哄弬鏁
- * 濡傛灉鎯宠緭鍑 {} 浣跨敤 \\杞箟 { 鍗冲彲锛屽鏋滄兂杈撳嚭 {} 涔嬪墠鐨 \ 浣跨敤鍙岃浆涔夌 \\\\ 鍗冲彲
- * 渚嬶細
- * 閫氬父浣跨敤锛歠ormat("this is {} for {}", "a", "b") -> this is a for b
- * 杞箟{}锛 format("this is \\{} for {}", "a", "b") -> this is \{} for a
- * 杞箟\锛 format("this is \\\\{} for {}", "a", "b") -> this is \a for b
- *
- * @param strPattern 瀛楃涓叉ā鏉
- * @param argArray 鍙傛暟鍒楄〃
- * @return 缁撴灉
- */
- public static String format(final String strPattern, final Object... argArray)
- {
- if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray))
- {
- return strPattern;
- }
- final int strPatternLength = strPattern.length();
-
- // 鍒濆鍖栧畾涔夊ソ鐨勯暱搴︿互鑾峰緱鏇村ソ鐨勬ц兘
- StringBuilder sbuf = new StringBuilder(strPatternLength + 50);
-
- int handledPosition = 0;
- int delimIndex;// 鍗犱綅绗︽墍鍦ㄤ綅缃
- for (int argIndex = 0; argIndex < argArray.length; argIndex++)
- {
- delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition);
- if (delimIndex == -1)
- {
- if (handledPosition == 0)
- {
- return strPattern;
- }
- else
- { // 瀛楃涓叉ā鏉垮墿浣欓儴鍒嗕笉鍐嶅寘鍚崰浣嶇锛屽姞鍏ュ墿浣欓儴鍒嗗悗杩斿洖缁撴灉
- sbuf.append(strPattern, handledPosition, strPatternLength);
- return sbuf.toString();
- }
- }
- else
- {
- if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH)
- {
- if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH)
- {
- // 杞箟绗︿箣鍓嶈繕鏈変竴涓浆涔夌锛屽崰浣嶇渚濇棫鏈夋晥
- sbuf.append(strPattern, handledPosition, delimIndex - 1);
- sbuf.append(Convert.utf8Str(argArray[argIndex]));
- handledPosition = delimIndex + 2;
- }
- else
- {
- // 鍗犱綅绗﹁杞箟
- argIndex--;
- sbuf.append(strPattern, handledPosition, delimIndex - 1);
- sbuf.append(C_DELIM_START);
- handledPosition = delimIndex + 1;
- }
- }
- else
- {
- // 姝ｅ父鍗犱綅绗
- sbuf.append(strPattern, handledPosition, delimIndex);
- sbuf.append(Convert.utf8Str(argArray[argIndex]));
- handledPosition = delimIndex + 2;
- }
- }
- }
- // append the characters following the last {} pair.
- // 鍔犲叆鏈鍚庝竴涓崰浣嶇鍚庢墍鏈夌殑瀛楃
- sbuf.append(strPattern, handledPosition, strPattern.length());
-
- return sbuf.toString();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/common/xss/XssFilter.java b/ruoyi/src/main/java/com/ruoyi/common/xss/XssFilter.java
deleted file mode 100644
index d307fbc9..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/xss/XssFilter.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.ruoyi.common.xss;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * 闃叉XSS鏀诲嚮鐨勮繃婊ゅ櫒
- *
- * @author ruoyi
- */
-public class XssFilter implements Filter
-{
- /**
- * 鎺掗櫎閾炬帴
- */
- public List excludes = new ArrayList<>();
-
- /**
- * xss杩囨护寮鍏
- */
- public boolean enabled = false;
-
- @Override
- public void init(FilterConfig filterConfig) throws ServletException
- {
- String tempExcludes = filterConfig.getInitParameter("excludes");
- String tempEnabled = filterConfig.getInitParameter("enabled");
- if (StringUtils.isNotEmpty(tempExcludes))
- {
- String[] url = tempExcludes.split(",");
- for (int i = 0; url != null && i < url.length; i++)
- {
- excludes.add(url[i]);
- }
- }
- if (StringUtils.isNotEmpty(tempEnabled))
- {
- enabled = Boolean.valueOf(tempEnabled);
- }
- }
-
- @Override
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
- throws IOException, ServletException
- {
- HttpServletRequest req = (HttpServletRequest) request;
- HttpServletResponse resp = (HttpServletResponse) response;
- if (handleExcludeURL(req, resp))
- {
- chain.doFilter(request, response);
- return;
- }
- XssHttpServletRequestWrapper xssRequest = new XssHttpServletRequestWrapper((HttpServletRequest) request);
- chain.doFilter(xssRequest, response);
- }
-
- private boolean handleExcludeURL(HttpServletRequest request, HttpServletResponse response)
- {
- if (!enabled)
- {
- return true;
- }
- if (excludes == null || excludes.isEmpty())
- {
- return false;
- }
- String url = request.getServletPath();
- for (String pattern : excludes)
- {
- Pattern p = Pattern.compile("^" + pattern);
- Matcher m = p.matcher(url);
- if (m.find())
- {
- return true;
- }
- }
- return false;
- }
-
- @Override
- public void destroy()
- {
-
- }
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/common/xss/XssHttpServletRequestWrapper.java b/ruoyi/src/main/java/com/ruoyi/common/xss/XssHttpServletRequestWrapper.java
deleted file mode 100644
index 1b90c886..00000000
--- a/ruoyi/src/main/java/com/ruoyi/common/xss/XssHttpServletRequestWrapper.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.ruoyi.common.xss;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import org.apache.commons.io.IOUtils;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.html.EscapeUtil;
-
-/**
- * XSS杩囨护澶勭悊
- *
- * @author ruoyi
- */
-public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
-{
- /**
- * @param request
- */
- public XssHttpServletRequestWrapper(HttpServletRequest request)
- {
- super(request);
- }
-
- @Override
- public String[] getParameterValues(String name)
- {
- String[] values = super.getParameterValues(name);
- if (values != null)
- {
- int length = values.length;
- String[] escapseValues = new String[length];
- for (int i = 0; i < length; i++)
- {
- // 闃瞲ss鏀诲嚮鍜岃繃婊ゅ墠鍚庣┖鏍
- escapseValues[i] = EscapeUtil.clean(values[i]).trim();
- }
- return escapseValues;
- }
- return super.getParameterValues(name);
- }
-
- @Override
- public ServletInputStream getInputStream() throws IOException
- {
- // 闈瀓son绫诲瀷锛岀洿鎺ヨ繑鍥
- if (!isJsonRequest())
- {
- return super.getInputStream();
- }
-
- // 涓虹┖锛岀洿鎺ヨ繑鍥
- String json = IOUtils.toString(super.getInputStream(), "utf-8");
- if (StringUtils.isEmpty(json))
- {
- return super.getInputStream();
- }
-
- // xss杩囨护
- json = EscapeUtil.clean(json).trim();
- final ByteArrayInputStream bis = new ByteArrayInputStream(json.getBytes("utf-8"));
- return new ServletInputStream()
- {
- @Override
- public boolean isFinished()
- {
- return true;
- }
-
- @Override
- public boolean isReady()
- {
- return true;
- }
-
- @Override
- public void setReadListener(ReadListener readListener)
- {
- }
-
- @Override
- public int read() throws IOException
- {
- return bis.read();
- }
- };
- }
-
- /**
- * 鏄惁鏄疛son璇锋眰
- *
- * @param request
- */
- public boolean isJsonRequest()
- {
- String header = super.getHeader(HttpHeaders.CONTENT_TYPE);
- return MediaType.APPLICATION_JSON_VALUE.equalsIgnoreCase(header)
- || MediaType.APPLICATION_JSON_UTF8_VALUE.equalsIgnoreCase(header);
- }
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
deleted file mode 100644
index 634f0ed6..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.ruoyi.framework.aspectj;
-
-import java.lang.reflect.Method;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.Signature;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.stereotype.Component;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.security.service.TokenService;
-import com.ruoyi.framework.web.domain.BaseEntity;
-import com.ruoyi.project.system.domain.SysRole;
-import com.ruoyi.project.system.domain.SysUser;
-
-/**
- * 鏁版嵁杩囨护澶勭悊
- *
- * @author ruoyi
- */
-@Aspect
-@Component
-public class DataScopeAspect
-{
- /**
- * 鍏ㄩ儴鏁版嵁鏉冮檺
- */
- public static final String DATA_SCOPE_ALL = "1";
-
- /**
- * 鑷畾鏁版嵁鏉冮檺
- */
- public static final String DATA_SCOPE_CUSTOM = "2";
-
- /**
- * 閮ㄩ棬鏁版嵁鏉冮檺
- */
- public static final String DATA_SCOPE_DEPT = "3";
-
- /**
- * 閮ㄩ棬鍙婁互涓嬫暟鎹潈闄
- */
- public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
-
- /**
- * 浠呮湰浜烘暟鎹潈闄
- */
- public static final String DATA_SCOPE_SELF = "5";
-
- // 閰嶇疆缁囧叆鐐
- @Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.DataScope)")
- public void dataScopePointCut()
- {
- }
-
- @Before("dataScopePointCut()")
- public void doBefore(JoinPoint point) throws Throwable
- {
- handleDataScope(point);
- }
-
- protected void handleDataScope(final JoinPoint joinPoint)
- {
- // 鑾峰緱娉ㄨВ
- DataScope controllerDataScope = getAnnotationLog(joinPoint);
- if (controllerDataScope == null)
- {
- return;
- }
- // 鑾峰彇褰撳墠鐨勭敤鎴
- LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
- SysUser currentUser = loginUser.getUser();
- if (currentUser != null)
- {
- // 濡傛灉鏄秴绾х鐞嗗憳锛屽垯涓嶈繃婊ゆ暟鎹
- if (!currentUser.isAdmin())
- {
- dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
- controllerDataScope.userAlias());
- }
- }
- }
-
- /**
- * 鏁版嵁鑼冨洿杩囨护
- *
- * @param joinPoint 鍒囩偣
- * @param user 鐢ㄦ埛
- * @param alias 鍒悕
- */
- public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias)
- {
- StringBuilder sqlString = new StringBuilder();
-
- for (SysRole role : user.getRoles())
- {
- String dataScope = role.getDataScope();
- if (DATA_SCOPE_ALL.equals(dataScope))
- {
- sqlString = new StringBuilder();
- break;
- }
- else if (DATA_SCOPE_CUSTOM.equals(dataScope))
- {
- sqlString.append(StringUtils.format(
- " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias,
- role.getRoleId()));
- }
- else if (DATA_SCOPE_DEPT.equals(dataScope))
- {
- sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
- }
- else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
- {
- sqlString.append(StringUtils.format(
- " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
- deptAlias, user.getDeptId(), user.getDeptId()));
- }
- else if (DATA_SCOPE_SELF.equals(dataScope))
- {
- if (StringUtils.isNotBlank(userAlias))
- {
- sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
- }
- else
- {
- // 鏁版嵁鏉冮檺涓轰粎鏈汉涓旀病鏈塽serAlias鍒悕涓嶆煡璇换浣曟暟鎹
- sqlString.append(" OR 1=0 ");
- }
- }
- }
-
- if (StringUtils.isNotBlank(sqlString.toString()))
- {
- BaseEntity baseEntity = (BaseEntity) joinPoint.getArgs()[0];
- baseEntity.setDataScope(" AND (" + sqlString.substring(4) + ")");
- }
- }
-
- /**
- * 鏄惁瀛樺湪娉ㄨВ锛屽鏋滃瓨鍦ㄥ氨鑾峰彇
- */
- private DataScope getAnnotationLog(JoinPoint joinPoint)
- {
- Signature signature = joinPoint.getSignature();
- MethodSignature methodSignature = (MethodSignature) signature;
- Method method = methodSignature.getMethod();
-
- if (method != null)
- {
- return method.getAnnotation(DataScope.class);
- }
- return null;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
deleted file mode 100644
index 5bdff86b..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.ruoyi.framework.aspectj;
-
-import java.lang.reflect.Method;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.DataSource;
-import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder;
-
-/**
- * 澶氭暟鎹簮澶勭悊
- *
- * @author ruoyi
- */
-@Aspect
-@Order(1)
-@Component
-public class DataSourceAspect
-{
- protected Logger logger = LoggerFactory.getLogger(getClass());
-
- @Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.DataSource)"
- + "|| @within(com.ruoyi.framework.aspectj.lang.annotation.DataSource)")
- public void dsPointCut()
- {
-
- }
-
- @Around("dsPointCut()")
- public Object around(ProceedingJoinPoint point) throws Throwable
- {
- DataSource dataSource = getDataSource(point);
-
- if (StringUtils.isNotNull(dataSource))
- {
- DynamicDataSourceContextHolder.setDataSourceType(dataSource.value().name());
- }
-
- try
- {
- return point.proceed();
- }
- finally
- {
- // 閿姣佹暟鎹簮 鍦ㄦ墽琛屾柟娉曚箣鍚
- DynamicDataSourceContextHolder.clearDataSourceType();
- }
- }
-
- /**
- * 鑾峰彇闇瑕佸垏鎹㈢殑鏁版嵁婧
- */
- public DataSource getDataSource(ProceedingJoinPoint point)
- {
- MethodSignature signature = (MethodSignature) point.getSignature();
- Class targetClass = point.getTarget().getClass();
- DataSource targetDataSource = targetClass.getAnnotation(DataSource.class);
- if (StringUtils.isNotNull(targetDataSource))
- {
- return targetDataSource;
- }
- else
- {
- Method method = signature.getMethod();
- DataSource dataSource = method.getAnnotation(DataSource.class);
- return dataSource;
- }
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
deleted file mode 100644
index 29a1c97e..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package com.ruoyi.framework.aspectj;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.Signature;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.HandlerMapping;
-import com.alibaba.fastjson.JSON;
-import com.ruoyi.common.enums.HttpMethod;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.ip.IpUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessStatus;
-import com.ruoyi.framework.manager.AsyncManager;
-import com.ruoyi.framework.manager.factory.AsyncFactory;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.security.service.TokenService;
-import com.ruoyi.project.monitor.domain.SysOperLog;
-
-/**
- * 鎿嶄綔鏃ュ織璁板綍澶勭悊
- *
- * @author ruoyi
- */
-@Aspect
-@Component
-public class LogAspect
-{
- private static final Logger log = LoggerFactory.getLogger(LogAspect.class);
-
- // 閰嶇疆缁囧叆鐐
- @Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.Log)")
- public void logPointCut()
- {
- }
-
- /**
- * 澶勭悊瀹岃姹傚悗鎵ц
- *
- * @param joinPoint 鍒囩偣
- */
- @AfterReturning(pointcut = "logPointCut()", returning = "jsonResult")
- public void doAfterReturning(JoinPoint joinPoint, Object jsonResult)
- {
- handleLog(joinPoint, null, jsonResult);
- }
-
- /**
- * 鎷︽埅寮傚父鎿嶄綔
- *
- * @param joinPoint 鍒囩偣
- * @param e 寮傚父
- */
- @AfterThrowing(value = "logPointCut()", throwing = "e")
- public void doAfterThrowing(JoinPoint joinPoint, Exception e)
- {
- handleLog(joinPoint, e, null);
- }
-
- protected void handleLog(final JoinPoint joinPoint, final Exception e, Object jsonResult)
- {
- try
- {
- // 鑾峰緱娉ㄨВ
- Log controllerLog = getAnnotationLog(joinPoint);
- if (controllerLog == null)
- {
- return;
- }
-
- // 鑾峰彇褰撳墠鐨勭敤鎴
- LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-
- // *========鏁版嵁搴撴棩蹇=========*//
- SysOperLog operLog = new SysOperLog();
- operLog.setStatus(BusinessStatus.SUCCESS.ordinal());
- // 璇锋眰鐨勫湴鍧
- String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
- operLog.setOperIp(ip);
- // 杩斿洖鍙傛暟
- operLog.setJsonResult(JSON.toJSONString(jsonResult));
-
- operLog.setOperUrl(ServletUtils.getRequest().getRequestURI());
- if (loginUser != null)
- {
- operLog.setOperName(loginUser.getUsername());
- }
-
- if (e != null)
- {
- operLog.setStatus(BusinessStatus.FAIL.ordinal());
- operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000));
- }
- // 璁剧疆鏂规硶鍚嶇О
- String className = joinPoint.getTarget().getClass().getName();
- String methodName = joinPoint.getSignature().getName();
- operLog.setMethod(className + "." + methodName + "()");
- // 璁剧疆璇锋眰鏂瑰紡
- operLog.setRequestMethod(ServletUtils.getRequest().getMethod());
- // 澶勭悊璁剧疆娉ㄨВ涓婄殑鍙傛暟
- getControllerMethodDescription(joinPoint, controllerLog, operLog);
- // 淇濆瓨鏁版嵁搴
- AsyncManager.me().execute(AsyncFactory.recordOper(operLog));
- }
- catch (Exception exp)
- {
- // 璁板綍鏈湴寮傚父鏃ュ織
- log.error("==鍓嶇疆閫氱煡寮傚父==");
- log.error("寮傚父淇℃伅:{}", exp.getMessage());
- exp.printStackTrace();
- }
- }
-
- /**
- * 鑾峰彇娉ㄨВ涓鏂规硶鐨勬弿杩颁俊鎭 鐢ㄤ簬Controller灞傛敞瑙
- *
- * @param log 鏃ュ織
- * @param operLog 鎿嶄綔鏃ュ織
- * @throws Exception
- */
- public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog) throws Exception
- {
- // 璁剧疆action鍔ㄤ綔
- operLog.setBusinessType(log.businessType().ordinal());
- // 璁剧疆鏍囬
- operLog.setTitle(log.title());
- // 璁剧疆鎿嶄綔浜虹被鍒
- operLog.setOperatorType(log.operatorType().ordinal());
- // 鏄惁闇瑕佷繚瀛榬equest锛屽弬鏁板拰鍊
- if (log.isSaveRequestData())
- {
- // 鑾峰彇鍙傛暟鐨勪俊鎭紝浼犲叆鍒版暟鎹簱涓
- setRequestValue(joinPoint, operLog);
- }
- }
-
- /**
- * 鑾峰彇璇锋眰鐨勫弬鏁帮紝鏀惧埌log涓
- *
- * @param operLog 鎿嶄綔鏃ュ織
- * @throws Exception 寮傚父
- */
- private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog) throws Exception
- {
- String requestMethod = operLog.getRequestMethod();
- if (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod))
- {
- String params = argsArrayToString(joinPoint.getArgs());
- operLog.setOperParam(StringUtils.substring(params, 0, 2000));
- }
- else
- {
- Map paramsMap = (Map) ServletUtils.getRequest().getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
- operLog.setOperParam(StringUtils.substring(paramsMap.toString(), 0, 2000));
- }
- }
-
- /**
- * 鏄惁瀛樺湪娉ㄨВ锛屽鏋滃瓨鍦ㄥ氨鑾峰彇
- */
- private Log getAnnotationLog(JoinPoint joinPoint) throws Exception
- {
- Signature signature = joinPoint.getSignature();
- MethodSignature methodSignature = (MethodSignature) signature;
- Method method = methodSignature.getMethod();
-
- if (method != null)
- {
- return method.getAnnotation(Log.class);
- }
- return null;
- }
-
- /**
- * 鍙傛暟鎷艰
- */
- private String argsArrayToString(Object[] paramsArray)
- {
- String params = "";
- if (paramsArray != null && paramsArray.length > 0)
- {
- for (int i = 0; i < paramsArray.length; i++)
- {
- if (!isFilterObject(paramsArray[i]))
- {
- Object jsonObj = JSON.toJSON(paramsArray[i]);
- params += jsonObj.toString() + " ";
- }
- }
- }
- return params.trim();
- }
-
- /**
- * 鍒ゆ柇鏄惁闇瑕佽繃婊ょ殑瀵硅薄銆
- *
- * @param o 瀵硅薄淇℃伅銆
- * @return 濡傛灉鏄渶瑕佽繃婊ょ殑瀵硅薄锛屽垯杩斿洖true锛涘惁鍒欒繑鍥瀎alse銆
- */
- public boolean isFilterObject(final Object o)
- {
- return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java
deleted file mode 100644
index 5e4cc9c2..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.ruoyi.framework.aspectj.lang.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 鏁版嵁鏉冮檺杩囨护娉ㄨВ
- *
- * @author ruoyi
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface DataScope
-{
- /**
- * 閮ㄩ棬琛ㄧ殑鍒悕
- */
- public String deptAlias() default "";
-
- /**
- * 鐢ㄦ埛琛ㄧ殑鍒悕
- */
- public String userAlias() default "";
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java
deleted file mode 100644
index 4df29ff1..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.ruoyi.framework.aspectj.lang.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import com.ruoyi.framework.aspectj.lang.enums.DataSourceType;
-
-/**
- * 鑷畾涔夊鏁版嵁婧愬垏鎹㈡敞瑙
- *
- * @author ruoyi
- */
-@Target({ ElementType.METHOD, ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-public @interface DataSource
-{
- /**
- * 鍒囨崲鏁版嵁婧愬悕绉
- */
- public DataSourceType value() default DataSourceType.MASTER;
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java
deleted file mode 100644
index 8037cb8b..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package com.ruoyi.framework.aspectj.lang.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 鑷畾涔夊鍑篍xcel鏁版嵁娉ㄨВ
- *
- * @author ruoyi
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface Excel
-{
- /**
- * 瀵煎嚭鍒癊xcel涓殑鍚嶅瓧.
- */
- public String name() default "";
-
- /**
- * 鏃ユ湡鏍煎紡, 濡: yyyy-MM-dd
- */
- public String dateFormat() default "";
-
- /**
- * 璇诲彇鍐呭杞〃杈惧紡 (濡: 0=鐢,1=濂,2=鏈煡)
- */
- public String readConverterExp() default "";
-
- /**
- * 瀵煎嚭绫诲瀷锛0鏁板瓧 1瀛楃涓诧級
- */
- public ColumnType cellType() default ColumnType.STRING;
-
- /**
- * 瀵煎嚭鏃跺湪excel涓瘡涓垪鐨勯珮搴 鍗曚綅涓哄瓧绗
- */
- public double height() default 14;
-
- /**
- * 瀵煎嚭鏃跺湪excel涓瘡涓垪鐨勫 鍗曚綅涓哄瓧绗
- */
- public double width() default 16;
-
- /**
- * 鏂囧瓧鍚庣紑,濡% 90 鍙樻垚90%
- */
- public String suffix() default "";
-
- /**
- * 褰撳间负绌烘椂,瀛楁鐨勯粯璁ゅ
- */
- public String defaultValue() default "";
-
- /**
- * 鎻愮ず淇℃伅
- */
- public String prompt() default "";
-
- /**
- * 璁剧疆鍙兘閫夋嫨涓嶈兘杈撳叆鐨勫垪鍐呭.
- */
- public String[] combo() default {};
-
- /**
- * 鏄惁瀵煎嚭鏁版嵁,搴斿闇姹:鏈夋椂鎴戜滑闇瑕佸鍑轰竴浠芥ā鏉,杩欐槸鏍囬闇瑕佷絾鍐呭闇瑕佺敤鎴锋墜宸ュ～鍐.
- */
- public boolean isExport() default true;
-
- /**
- * 鍙︿竴涓被涓殑灞炴у悕绉,鏀寔澶氱骇鑾峰彇,浠ュ皬鏁扮偣闅斿紑
- */
- public String targetAttr() default "";
-
- /**
- * 瀛楁绫诲瀷锛0锛氬鍑哄鍏ワ紱1锛氫粎瀵煎嚭锛2锛氫粎瀵煎叆锛
- */
- Type type() default Type.ALL;
-
- public enum Type
- {
- ALL(0), EXPORT(1), IMPORT(2);
- private final int value;
-
- Type(int value)
- {
- this.value = value;
- }
-
- public int value()
- {
- return this.value;
- }
- }
-
- public enum ColumnType
- {
- NUMERIC(0), STRING(1);
- private final int value;
-
- ColumnType(int value)
- {
- this.value = value;
- }
-
- public int value()
- {
- return this.value;
- }
- }
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excels.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excels.java
deleted file mode 100644
index ff228020..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excels.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.ruoyi.framework.aspectj.lang.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Excel娉ㄨВ闆
- *
- * @author ruoyi
- */
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Excels
-{
- Excel[] value();
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java
deleted file mode 100644
index 548eaced..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.ruoyi.framework.aspectj.lang.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.aspectj.lang.enums.OperatorType;
-
-/**
- * 鑷畾涔夋搷浣滄棩蹇楄褰曟敞瑙
- *
- * @author ruoyi
- *
- */
-@Target({ ElementType.PARAMETER, ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface Log
-{
- /**
- * 妯″潡
- */
- public String title() default "";
-
- /**
- * 鍔熻兘
- */
- public BusinessType businessType() default BusinessType.OTHER;
-
- /**
- * 鎿嶄綔浜虹被鍒
- */
- public OperatorType operatorType() default OperatorType.MANAGE;
-
- /**
- * 鏄惁淇濆瓨璇锋眰鐨勫弬鏁
- */
- public boolean isSaveRequestData() default true;
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessStatus.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessStatus.java
deleted file mode 100644
index 7e27f2ec..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessStatus.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.framework.aspectj.lang.enums;
-
-/**
- * 鎿嶄綔鐘舵
- *
- * @author ruoyi
- *
- */
-public enum BusinessStatus
-{
- /**
- * 鎴愬姛
- */
- SUCCESS,
-
- /**
- * 澶辫触
- */
- FAIL,
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessType.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessType.java
deleted file mode 100644
index d974a648..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessType.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.ruoyi.framework.aspectj.lang.enums;
-
-/**
- * 涓氬姟鎿嶄綔绫诲瀷
- *
- * @author ruoyi
- */
-public enum BusinessType
-{
- /**
- * 鍏跺畠
- */
- OTHER,
-
- /**
- * 鏂板
- */
- INSERT,
-
- /**
- * 淇敼
- */
- UPDATE,
-
- /**
- * 鍒犻櫎
- */
- DELETE,
-
- /**
- * 鎺堟潈
- */
- GRANT,
-
- /**
- * 瀵煎嚭
- */
- EXPORT,
-
- /**
- * 瀵煎叆
- */
- IMPORT,
-
- /**
- * 寮洪
- */
- FORCE,
-
- /**
- * 鐢熸垚浠ｇ爜
- */
- GENCODE,
-
- /**
- * 娓呯┖鏁版嵁
- */
- CLEAN,
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/DataSourceType.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/DataSourceType.java
deleted file mode 100644
index 274dd349..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/DataSourceType.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.framework.aspectj.lang.enums;
-
-/**
- * 鏁版嵁婧
- *
- * @author ruoyi
- */
-public enum DataSourceType
-{
- /**
- * 涓诲簱
- */
- MASTER,
-
- /**
- * 浠庡簱
- */
- SLAVE
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/OperatorType.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/OperatorType.java
deleted file mode 100644
index 98685a61..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/OperatorType.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.ruoyi.framework.aspectj.lang.enums;
-
-/**
- * 鎿嶄綔浜虹被鍒
- *
- * @author ruoyi
- */
-public enum OperatorType
-{
- /**
- * 鍏跺畠
- */
- OTHER,
-
- /**
- * 鍚庡彴鐢ㄦ埛
- */
- MANAGE,
-
- /**
- * 鎵嬫満绔敤鎴
- */
- MOBILE
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java
deleted file mode 100644
index 5a6da111..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.ruoyi.framework.config;
-
-import java.util.TimeZone;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
-
-/**
- * 绋嬪簭娉ㄨВ閰嶇疆
- *
- * @author ruoyi
- */
-@Configuration
-// 琛ㄧず閫氳繃aop妗嗘灦鏆撮湶璇ヤ唬鐞嗗璞,AopContext鑳藉璁块棶
-@EnableAspectJAutoProxy(exposeProxy = true)
-// 鎸囧畾瑕佹壂鎻忕殑Mapper绫荤殑鍖呯殑璺緞
-@MapperScan("com.ruoyi.project.**.mapper")
-public class ApplicationConfig
-{
- /**
- * 鏃跺尯閰嶇疆
- */
- @Bean
- public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization()
- {
- return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault());
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/DruidConfig.java
deleted file mode 100644
index f0519d5a..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/config/DruidConfig.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.ruoyi.framework.config;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.sql.DataSource;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
-import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
-import com.alibaba.druid.util.Utils;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.framework.aspectj.lang.enums.DataSourceType;
-import com.ruoyi.framework.config.properties.DruidProperties;
-import com.ruoyi.framework.datasource.DynamicDataSource;
-
-/**
- * druid 閰嶇疆澶氭暟鎹簮
- *
- * @author ruoyi
- */
-@Configuration
-public class DruidConfig
-{
- @Bean
- @ConfigurationProperties("spring.datasource.druid.master")
- public DataSource masterDataSource(DruidProperties druidProperties)
- {
- DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
- return druidProperties.dataSource(dataSource);
- }
-
- @Bean
- @ConfigurationProperties("spring.datasource.druid.slave")
- @ConditionalOnProperty(prefix = "spring.datasource.druid.slave", name = "enabled", havingValue = "true")
- public DataSource slaveDataSource(DruidProperties druidProperties)
- {
- DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
- return druidProperties.dataSource(dataSource);
- }
-
- @Bean(name = "dynamicDataSource")
- @Primary
- public DynamicDataSource dataSource(DataSource masterDataSource)
- {
- Map targetDataSources = new HashMap<>();
- targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource);
- setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource");
- return new DynamicDataSource(masterDataSource, targetDataSources);
- }
-
- /**
- * 璁剧疆鏁版嵁婧
- *
- * @param targetDataSources 澶囬夋暟鎹簮闆嗗悎
- * @param sourceName 鏁版嵁婧愬悕绉
- * @param beanName bean鍚嶇О
- */
- public void setDataSource(Map targetDataSources, String sourceName, String beanName)
- {
- try
- {
- DataSource dataSource = SpringUtils.getBean(beanName);
- targetDataSources.put(sourceName, dataSource);
- }
- catch (Exception e)
- {
- }
- }
-
- /**
- * 鍘婚櫎鐩戞帶椤甸潰搴曢儴鐨勫箍鍛
- */
- @SuppressWarnings({ "rawtypes", "unchecked" })
- @Bean
- @ConditionalOnProperty(name = "spring.datasource.druid.statViewServlet.enabled", havingValue = "true")
- public FilterRegistrationBean removeDruidFilterRegistrationBean(DruidStatProperties properties)
- {
- // 鑾峰彇web鐩戞帶椤甸潰鐨勫弬鏁
- DruidStatProperties.StatViewServlet config = properties.getStatViewServlet();
- // 鎻愬彇common.js鐨勯厤缃矾寰
- String pattern = config.getUrlPattern() != null ? config.getUrlPattern() : "/druid/*";
- String commonJsPattern = pattern.replaceAll("\\*", "js/common.js");
- final String filePath = "support/http/resources/js/common.js";
- // 鍒涘缓filter杩涜杩囨护
- Filter filter = new Filter()
- {
- @Override
- public void init(javax.servlet.FilterConfig filterConfig) throws ServletException
- {
- }
- @Override
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
- throws IOException, ServletException
- {
- chain.doFilter(request, response);
- // 閲嶇疆缂撳啿鍖猴紝鍝嶅簲澶翠笉浼氳閲嶇疆
- response.resetBuffer();
- // 鑾峰彇common.js
- String text = Utils.readFromResource(filePath);
- // 姝ｅ垯鏇挎崲banner, 闄ゅ幓搴曢儴鐨勫箍鍛婁俊鎭
- text = text.replaceAll("
", "");
- text = text.replaceAll("powered.*?shrek.wang", "");
- response.getWriter().write(text);
- }
- @Override
- public void destroy()
- {
- }
- };
- FilterRegistrationBean registrationBean = new FilterRegistrationBean();
- registrationBean.setFilter(filter);
- registrationBean.addUrlPatterns(commonJsPattern);
- return registrationBean;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java b/ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
deleted file mode 100644
index b623cae5..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.ruoyi.framework.config;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.data.redis.serializer.SerializationException;
-import com.alibaba.fastjson.parser.ParserConfig;
-import org.springframework.util.Assert;
-import java.nio.charset.Charset;
-
-/**
- * Redis浣跨敤FastJson搴忓垪鍖
- *
- * @author ruoyi
- */
-public class FastJson2JsonRedisSerializer implements RedisSerializer
-{
- @SuppressWarnings("unused")
- private ObjectMapper objectMapper = new ObjectMapper();
-
- public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
-
- private Class clazz;
-
- static
- {
- ParserConfig.getGlobalInstance().setAutoTypeSupport(true);
- }
-
- public FastJson2JsonRedisSerializer(Class clazz)
- {
- super();
- this.clazz = clazz;
- }
-
- public byte[] serialize(T t) throws SerializationException
- {
- if (t == null)
- {
- return new byte[0];
- }
- return JSON.toJSONString(t, SerializerFeature.WriteClassName).getBytes(DEFAULT_CHARSET);
- }
-
- public T deserialize(byte[] bytes) throws SerializationException
- {
- if (bytes == null || bytes.length <= 0)
- {
- return null;
- }
- String str = new String(bytes, DEFAULT_CHARSET);
-
- return JSON.parseObject(str, clazz);
- }
-
- public void setObjectMapper(ObjectMapper objectMapper)
- {
- Assert.notNull(objectMapper, "'objectMapper' must not be null");
- this.objectMapper = objectMapper;
- }
-
- protected JavaType getJavaType(Class clazz)
- {
- return TypeFactory.defaultInstance().constructType(clazz);
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/FilterConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/FilterConfig.java
deleted file mode 100644
index 92d010e8..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/config/FilterConfig.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.ruoyi.framework.config;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.servlet.DispatcherType;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.xss.XssFilter;
-
-/**
- * Filter閰嶇疆
- *
- * @author ruoyi
- */
-@Configuration
-public class FilterConfig
-{
- @Value("${xss.enabled}")
- private String enabled;
-
- @Value("${xss.excludes}")
- private String excludes;
-
- @Value("${xss.urlPatterns}")
- private String urlPatterns;
-
- @SuppressWarnings({ "rawtypes", "unchecked" })
- @Bean
- public FilterRegistrationBean xssFilterRegistration()
- {
- FilterRegistrationBean registration = new FilterRegistrationBean();
- registration.setDispatcherTypes(DispatcherType.REQUEST);
- registration.setFilter(new XssFilter());
- registration.addUrlPatterns(StringUtils.split(urlPatterns, ","));
- registration.setName("xssFilter");
- registration.setOrder(Integer.MAX_VALUE);
- Map initParameters = new HashMap();
- initParameters.put("excludes", excludes);
- initParameters.put("enabled", enabled);
- registration.setInitParameters(initParameters);
- return registration;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/GenConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/GenConfig.java
deleted file mode 100644
index a74e2c38..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/config/GenConfig.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.ruoyi.framework.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * 璇诲彇浠ｇ爜鐢熸垚鐩稿叧閰嶇疆
- *
- * @author ruoyi
- */
-@Component
-@ConfigurationProperties(prefix = "gen")
-public class GenConfig
-{
- /** 浣滆 */
- public static String author;
-
- /** 鐢熸垚鍖呰矾寰 */
- public static String packageName;
-
- /** 鑷姩鍘婚櫎琛ㄥ墠缂锛岄粯璁ゆ槸true */
- public static boolean autoRemovePre;
-
- /** 琛ㄥ墠缂(绫诲悕涓嶄細鍖呭惈琛ㄥ墠缂) */
- public static String tablePrefix;
-
- public static String getAuthor()
- {
- return author;
- }
-
- public void setAuthor(String author)
- {
- GenConfig.author = author;
- }
-
- public static String getPackageName()
- {
- return packageName;
- }
-
- public void setPackageName(String packageName)
- {
- GenConfig.packageName = packageName;
- }
-
- public static boolean getAutoRemovePre()
- {
- return autoRemovePre;
- }
-
- public void setAutoRemovePre(boolean autoRemovePre)
- {
- GenConfig.autoRemovePre = autoRemovePre;
- }
-
- public static String getTablePrefix()
- {
- return tablePrefix;
- }
-
- public void setTablePrefix(String tablePrefix)
- {
- GenConfig.tablePrefix = tablePrefix;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
deleted file mode 100644
index 69868f0b..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.ruoyi.framework.config;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import javax.sql.DataSource;
-import org.apache.ibatis.io.VFS;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionFactoryBean;
-import org.mybatis.spring.boot.autoconfigure.SpringBootVFS;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.core.io.support.ResourcePatternResolver;
-import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
-import org.springframework.core.type.classreading.MetadataReader;
-import org.springframework.core.type.classreading.MetadataReaderFactory;
-import org.springframework.util.ClassUtils;
-
-/**
- * Mybatis鏀寔*鍖归厤鎵弿鍖
- *
- * @author ruoyi
- */
-@Configuration
-public class MyBatisConfig
-{
- @Autowired
- private Environment env;
-
- static final String DEFAULT_RESOURCE_PATTERN = "**/*.class";
-
- public static String setTypeAliasesPackage(String typeAliasesPackage)
- {
- ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver();
- MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver);
- List allResult = new ArrayList();
- try
- {
- for (String aliasesPackage : typeAliasesPackage.split(","))
- {
- List result = new ArrayList();
- aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
- + ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN;
- Resource[] resources = resolver.getResources(aliasesPackage);
- if (resources != null && resources.length > 0)
- {
- MetadataReader metadataReader = null;
- for (Resource resource : resources)
- {
- if (resource.isReadable())
- {
- metadataReader = metadataReaderFactory.getMetadataReader(resource);
- try
- {
- result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName());
- }
- catch (ClassNotFoundException e)
- {
- e.printStackTrace();
- }
- }
- }
- }
- if (result.size() > 0)
- {
- HashSet hashResult = new HashSet(result);
- allResult.addAll(hashResult);
- }
- }
- if (allResult.size() > 0)
- {
- typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0]));
- }
- else
- {
- throw new RuntimeException("mybatis typeAliasesPackage 璺緞鎵弿閿欒,鍙傛暟typeAliasesPackage:" + typeAliasesPackage + "鏈壘鍒颁换浣曞寘");
- }
- }
- catch (IOException e)
- {
- e.printStackTrace();
- }
- return typeAliasesPackage;
- }
-
- @Bean
- public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception
- {
- String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage");
- String mapperLocations = env.getProperty("mybatis.mapperLocations");
- typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage);
- VFS.addImplClass(SpringBootVFS.class);
-
- final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
- sessionFactory.setDataSource(dataSource);
- sessionFactory.setTypeAliasesPackage(typeAliasesPackage);
- sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(mapperLocations));
- return sessionFactory.getObject();
- }
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/RedisConfig.java
deleted file mode 100644
index 6322686f..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/config/RedisConfig.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.ruoyi.framework.config;
-
-import org.springframework.cache.annotation.CachingConfigurerSupport;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-/**
- * redis閰嶇疆
- *
- * @author ruoyi
- */
-@Configuration
-@EnableCaching
-public class RedisConfig extends CachingConfigurerSupport
-{
- @Bean
- @SuppressWarnings(value = { "unchecked", "rawtypes" })
- public RedisTemplate redisTemplate(RedisConnectionFactory connectionFactory)
- {
- RedisTemplate template = new RedisTemplate<>();
- template.setConnectionFactory(connectionFactory);
-
- FastJson2JsonRedisSerializer serializer = new FastJson2JsonRedisSerializer(Object.class);
-
- ObjectMapper mapper = new ObjectMapper();
- mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
- mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
- serializer.setObjectMapper(mapper);
-
- template.setValueSerializer(serializer);
- // 浣跨敤StringRedisSerializer鏉ュ簭鍒楀寲鍜屽弽搴忓垪鍖杛edis鐨刱ey鍊
- template.setKeySerializer(new StringRedisSerializer());
- template.afterPropertiesSet();
- return template;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
deleted file mode 100644
index 8c19564b..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.ruoyi.framework.config;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;
-
-/**
- * 閫氱敤閰嶇疆
- *
- * @author ruoyi
- */
-@Configuration
-public class ResourcesConfig implements WebMvcConfigurer
-{
- @Autowired
- private RepeatSubmitInterceptor repeatSubmitInterceptor;
-
- @Override
- public void addResourceHandlers(ResourceHandlerRegistry registry)
- {
- /** 鏈湴鏂囦欢涓婁紶璺緞 */
- registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**").addResourceLocations("file:" + RuoYiConfig.getProfile() + "/");
-
- /** swagger閰嶇疆 */
- registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
- registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
- }
-
- /**
- * 鑷畾涔夋嫤鎴鍒
- */
- @Override
- public void addInterceptors(InterceptorRegistry registry)
- {
- registry.addInterceptor(repeatSubmitInterceptor).addPathPatterns("/**");
- }
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/RuoYiConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/RuoYiConfig.java
deleted file mode 100644
index 1f6e20ad..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/config/RuoYiConfig.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.ruoyi.framework.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * 璇诲彇椤圭洰鐩稿叧閰嶇疆
- *
- * @author ruoyi
- */
-@Component
-@ConfigurationProperties(prefix = "ruoyi")
-public class RuoYiConfig
-{
- /** 椤圭洰鍚嶇О */
- private String name;
-
- /** 鐗堟湰 */
- private String version;
-
- /** 鐗堟潈骞翠唤 */
- private String copyrightYear;
-
- /** 瀹炰緥婕旂ず寮鍏 */
- private boolean demoEnabled;
-
- /** 涓婁紶璺緞 */
- private static String profile;
-
- /** 鑾峰彇鍦板潃寮鍏 */
- private static boolean addressEnabled;
-
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- public String getVersion()
- {
- return version;
- }
-
- public void setVersion(String version)
- {
- this.version = version;
- }
-
- public String getCopyrightYear()
- {
- return copyrightYear;
- }
-
- public void setCopyrightYear(String copyrightYear)
- {
- this.copyrightYear = copyrightYear;
- }
-
- public boolean isDemoEnabled()
- {
- return demoEnabled;
- }
-
- public void setDemoEnabled(boolean demoEnabled)
- {
- this.demoEnabled = demoEnabled;
- }
-
- public static String getProfile()
- {
- return profile;
- }
-
- public void setProfile(String profile)
- {
- RuoYiConfig.profile = profile;
- }
-
- public static boolean isAddressEnabled()
- {
- return addressEnabled;
- }
-
- public void setAddressEnabled(boolean addressEnabled)
- {
- RuoYiConfig.addressEnabled = addressEnabled;
- }
-
- /**
- * 鑾峰彇澶村儚涓婁紶璺緞
- */
- public static String getAvatarPath()
- {
- return getProfile() + "/avatar";
- }
-
- /**
- * 鑾峰彇涓嬭浇璺緞
- */
- public static String getDownloadPath()
- {
- return getProfile() + "/download/";
- }
-
- /**
- * 鑾峰彇涓婁紶璺緞
- */
- public static String getUploadPath()
- {
- return getProfile() + "/upload";
- }
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
deleted file mode 100644
index 4e0eca49..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.ruoyi.framework.config;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.http.HttpMethod;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
-import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl;
-import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
-
-/**
- * spring security閰嶇疆
- *
- * @author ruoyi
- */
-@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
-public class SecurityConfig extends WebSecurityConfigurerAdapter
-{
- /**
- * 鑷畾涔夌敤鎴疯璇侀昏緫
- */
- @Autowired
- private UserDetailsService userDetailsService;
-
- /**
- * 璁よ瘉澶辫触澶勭悊绫
- */
- @Autowired
- private AuthenticationEntryPointImpl unauthorizedHandler;
-
- /**
- * 閫鍑哄鐞嗙被
- */
- @Autowired
- private LogoutSuccessHandlerImpl logoutSuccessHandler;
-
- /**
- * token璁よ瘉杩囨护鍣
- */
- @Autowired
- private JwtAuthenticationTokenFilter authenticationTokenFilter;
-
- /**
- * 瑙ｅ喅 鏃犳硶鐩存帴娉ㄥ叆 AuthenticationManager
- *
- * @return
- * @throws Exception
- */
- @Bean
- @Override
- public AuthenticationManager authenticationManagerBean() throws Exception
- {
- return super.authenticationManagerBean();
- }
-
- /**
- * anyRequest | 鍖归厤鎵鏈夎姹傝矾寰
- * access | SpringEl琛ㄨ揪寮忕粨鏋滀负true鏃跺彲浠ヨ闂
- * anonymous | 鍖垮悕鍙互璁块棶
- * denyAll | 鐢ㄦ埛涓嶈兘璁块棶
- * fullyAuthenticated | 鐢ㄦ埛瀹屽叏璁よ瘉鍙互璁块棶锛堥潪remember-me涓嬭嚜鍔ㄧ櫥褰曪級
- * hasAnyAuthority | 濡傛灉鏈夊弬鏁帮紝鍙傛暟琛ㄧず鏉冮檺锛屽垯鍏朵腑浠讳綍涓涓潈闄愬彲浠ヨ闂
- * hasAnyRole | 濡傛灉鏈夊弬鏁帮紝鍙傛暟琛ㄧず瑙掕壊锛屽垯鍏朵腑浠讳綍涓涓鑹插彲浠ヨ闂
- * hasAuthority | 濡傛灉鏈夊弬鏁帮紝鍙傛暟琛ㄧず鏉冮檺锛屽垯鍏舵潈闄愬彲浠ヨ闂
- * hasIpAddress | 濡傛灉鏈夊弬鏁帮紝鍙傛暟琛ㄧずIP鍦板潃锛屽鏋滅敤鎴稩P鍜屽弬鏁板尮閰嶏紝鍒欏彲浠ヨ闂
- * hasRole | 濡傛灉鏈夊弬鏁帮紝鍙傛暟琛ㄧず瑙掕壊锛屽垯鍏惰鑹插彲浠ヨ闂
- * permitAll | 鐢ㄦ埛鍙互浠绘剰璁块棶
- * rememberMe | 鍏佽閫氳繃remember-me鐧诲綍鐨勭敤鎴疯闂
- * authenticated | 鐢ㄦ埛鐧诲綍鍚庡彲璁块棶
- */
- @Override
- protected void configure(HttpSecurity httpSecurity) throws Exception
- {
- httpSecurity
- // CRSF绂佺敤锛屽洜涓轰笉浣跨敤session
- .csrf().disable()
- // 璁よ瘉澶辫触澶勭悊绫
- .exceptionHandling().authenticationEntryPoint(unauthorizedHandler).and()
- // 鍩轰簬token锛屾墍浠ヤ笉闇瑕乻ession
- .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
- // 杩囨护璇锋眰
- .authorizeRequests()
- // 瀵逛簬鐧诲綍login 楠岃瘉鐮乧aptchaImage 鍏佽鍖垮悕璁块棶
- .antMatchers("/login", "/captchaImage").anonymous()
- .antMatchers(
- HttpMethod.GET,
- "/*.html",
- "/**/*.html",
- "/**/*.css",
- "/**/*.js"
- ).permitAll()
- .antMatchers("/profile/**").anonymous()
- .antMatchers("/common/download**").anonymous()
- .antMatchers("/swagger-ui.html").anonymous()
- .antMatchers("/swagger-resources/**").anonymous()
- .antMatchers("/webjars/**").anonymous()
- .antMatchers("/*/api-docs").anonymous()
- .antMatchers("/druid/**").anonymous()
- // 闄や笂闈㈠鐨勬墍鏈夎姹傚叏閮ㄩ渶瑕侀壌鏉冭璇
- .anyRequest().authenticated()
- .and()
- .headers().frameOptions().disable();
- httpSecurity.logout().logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler);
- // 娣诲姞JWT filter
- httpSecurity.addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class);
- }
-
-
- /**
- * 寮烘暎鍒楀搱甯屽姞瀵嗗疄鐜
- */
- @Bean
- public BCryptPasswordEncoder bCryptPasswordEncoder()
- {
- return new BCryptPasswordEncoder();
- }
-
- /**
- * 韬唤璁よ瘉鎺ュ彛
- */
- @Override
- protected void configure(AuthenticationManagerBuilder auth) throws Exception
- {
- auth.userDetailsService(userDetailsService).passwordEncoder(bCryptPasswordEncoder());
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/ServerConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/ServerConfig.java
deleted file mode 100644
index 157e9f46..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/config/ServerConfig.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.ruoyi.framework.config;
-
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.stereotype.Component;
-import com.ruoyi.common.utils.ServletUtils;
-
-/**
- * 鏈嶅姟鐩稿叧閰嶇疆
- *
- * @author ruoyi
- */
-@Component
-public class ServerConfig
-{
- /**
- * 鑾峰彇瀹屾暣鐨勮姹傝矾寰勶紝鍖呮嫭锛氬煙鍚嶏紝绔彛锛屼笂涓嬫枃璁块棶璺緞
- *
- * @return 鏈嶅姟鍦板潃
- */
- public String getUrl()
- {
- HttpServletRequest request = ServletUtils.getRequest();
- return getDomain(request);
- }
-
- public static String getDomain(HttpServletRequest request)
- {
- StringBuffer url = request.getRequestURL();
- String contextPath = request.getServletContext().getContextPath();
- return url.delete(url.length() - request.getRequestURI().length(), url.length()).append(contextPath).toString();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
deleted file mode 100644
index a51cd34f..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package com.ruoyi.framework.config;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import io.swagger.annotations.ApiOperation;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.ApiKey;
-import springfox.documentation.service.AuthorizationScope;
-import springfox.documentation.service.Contact;
-import springfox.documentation.service.SecurityReference;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spi.service.contexts.SecurityContext;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/**
- * Swagger2鐨勬帴鍙ｉ厤缃
- *
- * @author ruoyi
- */
-@Configuration
-@EnableSwagger2
-public class SwaggerConfig
-{
- /** 绯荤粺鍩虹閰嶇疆 */
- @Autowired
- private RuoYiConfig ruoyiConfig;
-
- /**
- * 鍒涘缓API
- */
- @Bean
- public Docket createRestApi()
- {
- return new Docket(DocumentationType.SWAGGER_2)
- .pathMapping("/dev-api")
- // 鐢ㄦ潵鍒涘缓璇PI鐨勫熀鏈俊鎭紝灞曠ず鍦ㄦ枃妗ｇ殑椤甸潰涓紙鑷畾涔夊睍绀虹殑淇℃伅锛
- .apiInfo(apiInfo())
- // 璁剧疆鍝簺鎺ュ彛鏆撮湶缁橲wagger灞曠ず
- .select()
- // 鎵弿鎵鏈夋湁娉ㄨВ鐨刟pi锛岀敤杩欑鏂瑰紡鏇寸伒娲
- .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
- // 鎵弿鎸囧畾鍖呬腑鐨剆wagger娉ㄨВ
- //.apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger"))
- // 鎵弿鎵鏈 .apis(RequestHandlerSelectors.any())
- .paths(PathSelectors.any())
- .build()
- /* 璁剧疆瀹夊叏妯″紡锛宻wagger鍙互璁剧疆璁块棶token */
- .securitySchemes(securitySchemes())
- .securityContexts(securityContexts());
- }
-
- /**
- * 瀹夊叏妯″紡锛岃繖閲屾寚瀹歵oken閫氳繃Authorization澶磋姹傚ご浼犻
- */
- private List securitySchemes()
- {
- List apiKeyList = new ArrayList();
- apiKeyList.add(new ApiKey("Authorization", "Authorization", "header"));
- return apiKeyList;
- }
-
- /**
- * 瀹夊叏涓婁笅鏂
- */
- private List securityContexts()
- {
- List securityContexts = new ArrayList<>();
- securityContexts.add(
- SecurityContext.builder()
- .securityReferences(defaultAuth())
- .forPaths(PathSelectors.regex("^(?!auth).*$"))
- .build());
- return securityContexts;
- }
-
- /**
- * 榛樿鐨勫畨鍏ㄤ笂寮曠敤
- */
- private List defaultAuth()
- {
- AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
- AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
- authorizationScopes[0] = authorizationScope;
- List securityReferences = new ArrayList<>();
- securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
- return securityReferences;
- }
-
- /**
- * 娣诲姞鎽樿淇℃伅
- */
- private ApiInfo apiInfo()
- {
- // 鐢ˋpiInfoBuilder杩涜瀹氬埗
- return new ApiInfoBuilder()
- // 璁剧疆鏍囬
- .title("鏍囬锛氳嫢渚濈鐞嗙郴缁焈鎺ュ彛鏂囨。")
- // 鎻忚堪
- .description("鎻忚堪锛氱敤浜庣鐞嗛泦鍥㈡棗涓嬪叕鍙哥殑浜哄憳淇℃伅,鍏蜂綋鍖呮嫭XXX,XXX妯″潡...")
- // 浣滆呬俊鎭
- .contact(new Contact(ruoyiConfig.getName(), null, null))
- // 鐗堟湰
- .version("鐗堟湰鍙:" + ruoyiConfig.getVersion())
- .build();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java
deleted file mode 100644
index 618a925d..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.ruoyi.framework.config;
-
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.ThreadPoolExecutor;
-import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import com.ruoyi.common.utils.Threads;
-
-/**
- * 绾跨▼姹犻厤缃
- *
- * @author ruoyi
- **/
-@Configuration
-public class ThreadPoolConfig
-{
- // 鏍稿績绾跨▼姹犲ぇ灏
- private int corePoolSize = 50;
-
- // 鏈澶у彲鍒涘缓鐨勭嚎绋嬫暟
- private int maxPoolSize = 200;
-
- // 闃熷垪鏈澶ч暱搴
- private int queueCapacity = 1000;
-
- // 绾跨▼姹犵淮鎶ょ嚎绋嬫墍鍏佽鐨勭┖闂叉椂闂
- private int keepAliveSeconds = 300;
-
- @Bean(name = "threadPoolTaskExecutor")
- public ThreadPoolTaskExecutor threadPoolTaskExecutor()
- {
- ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
- executor.setMaxPoolSize(maxPoolSize);
- executor.setCorePoolSize(corePoolSize);
- executor.setQueueCapacity(queueCapacity);
- executor.setKeepAliveSeconds(keepAliveSeconds);
- // 绾跨▼姹犲鎷掔粷浠诲姟(鏃犵嚎绋嬪彲鐢)鐨勫鐞嗙瓥鐣
- executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
- return executor;
- }
-
- /**
- * 鎵ц鍛ㄦ湡鎬ф垨瀹氭椂浠诲姟
- */
- @Bean(name = "scheduledExecutorService")
- protected ScheduledExecutorService scheduledExecutorService()
- {
- return new ScheduledThreadPoolExecutor(corePoolSize,
- new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build())
- {
- @Override
- protected void afterExecute(Runnable r, Throwable t)
- {
- super.afterExecute(r, t);
- Threads.printException(r, t);
- }
- };
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java b/ruoyi/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java
deleted file mode 100644
index ae6e02fd..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.ruoyi.framework.config.properties;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-import com.alibaba.druid.pool.DruidDataSource;
-
-/**
- * druid 閰嶇疆灞炴
- *
- * @author ruoyi
- */
-@Configuration
-public class DruidProperties
-{
- @Value("${spring.datasource.druid.initialSize}")
- private int initialSize;
-
- @Value("${spring.datasource.druid.minIdle}")
- private int minIdle;
-
- @Value("${spring.datasource.druid.maxActive}")
- private int maxActive;
-
- @Value("${spring.datasource.druid.maxWait}")
- private int maxWait;
-
- @Value("${spring.datasource.druid.timeBetweenEvictionRunsMillis}")
- private int timeBetweenEvictionRunsMillis;
-
- @Value("${spring.datasource.druid.minEvictableIdleTimeMillis}")
- private int minEvictableIdleTimeMillis;
-
- @Value("${spring.datasource.druid.maxEvictableIdleTimeMillis}")
- private int maxEvictableIdleTimeMillis;
-
- @Value("${spring.datasource.druid.validationQuery}")
- private String validationQuery;
-
- @Value("${spring.datasource.druid.testWhileIdle}")
- private boolean testWhileIdle;
-
- @Value("${spring.datasource.druid.testOnBorrow}")
- private boolean testOnBorrow;
-
- @Value("${spring.datasource.druid.testOnReturn}")
- private boolean testOnReturn;
-
- public DruidDataSource dataSource(DruidDataSource datasource)
- {
- /** 閰嶇疆鍒濆鍖栧ぇ灏忋佹渶灏忋佹渶澶 */
- datasource.setInitialSize(initialSize);
- datasource.setMaxActive(maxActive);
- datasource.setMinIdle(minIdle);
-
- /** 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂 */
- datasource.setMaxWait(maxWait);
-
- /** 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣 */
- datasource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
-
- /** 閰嶇疆涓涓繛鎺ュ湪姹犱腑鏈灏忋佹渶澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣 */
- datasource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
- datasource.setMaxEvictableIdleTimeMillis(maxEvictableIdleTimeMillis);
-
- /**
- * 鐢ㄦ潵妫娴嬭繛鎺ユ槸鍚︽湁鏁堢殑sql锛岃姹傛槸涓涓煡璇㈣鍙ワ紝甯哥敤select 'x'銆傚鏋渧alidationQuery涓簄ull锛宼estOnBorrow銆乼estOnReturn銆乼estWhileIdle閮戒笉浼氳捣浣滅敤銆
- */
- datasource.setValidationQuery(validationQuery);
- /** 寤鸿閰嶇疆涓簍rue锛屼笉褰卞搷鎬ц兘锛屽苟涓斾繚璇佸畨鍏ㄦс傜敵璇疯繛鎺ョ殑鏃跺欐娴嬶紝濡傛灉绌洪棽鏃堕棿澶т簬timeBetweenEvictionRunsMillis锛屾墽琛寁alidationQuery妫娴嬭繛鎺ユ槸鍚︽湁鏁堛 */
- datasource.setTestWhileIdle(testWhileIdle);
- /** 鐢宠杩炴帴鏃舵墽琛寁alidationQuery妫娴嬭繛鎺ユ槸鍚︽湁鏁堬紝鍋氫簡杩欎釜閰嶇疆浼氶檷浣庢ц兘銆 */
- datasource.setTestOnBorrow(testOnBorrow);
- /** 褰掕繕杩炴帴鏃舵墽琛寁alidationQuery妫娴嬭繛鎺ユ槸鍚︽湁鏁堬紝鍋氫簡杩欎釜閰嶇疆浼氶檷浣庢ц兘銆 */
- datasource.setTestOnReturn(testOnReturn);
- return datasource;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java b/ruoyi/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java
deleted file mode 100644
index 014ae380..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.ruoyi.framework.datasource;
-
-import java.util.Map;
-import javax.sql.DataSource;
-import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
-
-/**
- * 鍔ㄦ佹暟鎹簮
- *
- * @author ruoyi
- */
-public class DynamicDataSource extends AbstractRoutingDataSource
-{
- public DynamicDataSource(DataSource defaultTargetDataSource, Map targetDataSources)
- {
- super.setDefaultTargetDataSource(defaultTargetDataSource);
- super.setTargetDataSources(targetDataSources);
- super.afterPropertiesSet();
- }
-
- @Override
- protected Object determineCurrentLookupKey()
- {
- return DynamicDataSourceContextHolder.getDataSourceType();
- }
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java b/ruoyi/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java
deleted file mode 100644
index 20a0dda4..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.ruoyi.framework.datasource;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * 鏁版嵁婧愬垏鎹㈠鐞
- *
- * @author ruoyi
- */
-public class DynamicDataSourceContextHolder
-{
- public static final Logger log = LoggerFactory.getLogger(DynamicDataSourceContextHolder.class);
-
- /**
- * 浣跨敤ThreadLocal缁存姢鍙橀噺锛孴hreadLocal涓烘瘡涓娇鐢ㄨ鍙橀噺鐨勭嚎绋嬫彁渚涚嫭绔嬬殑鍙橀噺鍓湰锛
- * 鎵浠ユ瘡涓涓嚎绋嬮兘鍙互鐙珛鍦版敼鍙樿嚜宸辩殑鍓湰锛岃屼笉浼氬奖鍝嶅叾瀹冪嚎绋嬫墍瀵瑰簲鐨勫壇鏈
- */
- private static final ThreadLocal CONTEXT_HOLDER = new ThreadLocal<>();
-
- /**
- * 璁剧疆鏁版嵁婧愮殑鍙橀噺
- */
- public static void setDataSourceType(String dsType)
- {
- log.info("鍒囨崲鍒皗}鏁版嵁婧", dsType);
- CONTEXT_HOLDER.set(dsType);
- }
-
- /**
- * 鑾峰緱鏁版嵁婧愮殑鍙橀噺
- */
- public static String getDataSourceType()
- {
- return CONTEXT_HOLDER.get();
- }
-
- /**
- * 娓呯┖鏁版嵁婧愬彉閲
- */
- public static void clearDataSourceType()
- {
- CONTEXT_HOLDER.remove();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java b/ruoyi/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
deleted file mode 100644
index 088798d5..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.ruoyi.framework.interceptor;
-
-import java.lang.reflect.Method;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.stereotype.Component;
-import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
-import com.ruoyi.framework.web.domain.AjaxResult;
-
-/**
- * 闃叉閲嶅鎻愪氦鎷︽埅鍣
- *
- * @author ruoyi
- */
-@Component
-public abstract class RepeatSubmitInterceptor extends HandlerInterceptorAdapter
-{
- @Override
- public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception
- {
- if (handler instanceof HandlerMethod)
- {
- HandlerMethod handlerMethod = (HandlerMethod) handler;
- Method method = handlerMethod.getMethod();
- RepeatSubmit annotation = method.getAnnotation(RepeatSubmit.class);
- if (annotation != null)
- {
- if (this.isRepeatSubmit(request))
- {
- AjaxResult ajaxResult = AjaxResult.error("涓嶅厑璁搁噸澶嶆彁浜わ紝璇风◢鍚庡啀璇");
- ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult));
- return false;
- }
- }
- return true;
- }
- else
- {
- return super.preHandle(request, response, handler);
- }
- }
-
- /**
- * 楠岃瘉鏄惁閲嶅鎻愪氦鐢卞瓙绫诲疄鐜板叿浣撶殑闃查噸澶嶆彁浜ょ殑瑙勫垯
- *
- * @param httpServletRequest
- * @return
- * @throws Exception
- */
- public abstract boolean isRepeatSubmit(HttpServletRequest request);
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java b/ruoyi/src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java
deleted file mode 100644
index 0fbd73b6..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.ruoyi.framework.interceptor.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 鑷畾涔夋敞瑙ｉ槻姝㈣〃鍗曢噸澶嶆彁浜
- *
- * @author ruoyi
- *
- */
-@Inherited
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface RepeatSubmit
-{
-
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java b/ruoyi/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
deleted file mode 100644
index 9d915c6e..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.ruoyi.framework.interceptor.impl;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import org.springframework.stereotype.Component;
-import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;
-
-/**
- * 鍒ゆ柇璇锋眰url鍜屾暟鎹槸鍚﹀拰涓婁竴娆＄浉鍚岋紝
- * 濡傛灉鍜屼笂娆＄浉鍚岋紝鍒欐槸閲嶅鎻愪氦琛ㄥ崟銆 鏈夋晥鏃堕棿涓10绉掑唴銆
- *
- * @author ruoyi
- */
-@Component
-public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
-{
- public final String REPEAT_PARAMS = "repeatParams";
-
- public final String REPEAT_TIME = "repeatTime";
-
- public final String SESSION_REPEAT_KEY = "repeatData";
-
- /**
- * 闂撮殧鏃堕棿锛屽崟浣:绉 榛樿10绉
- *
- * 涓ゆ鐩稿悓鍙傛暟鐨勮姹傦紝濡傛灉闂撮殧鏃堕棿澶т簬璇ュ弬鏁帮紝绯荤粺涓嶄細璁ゅ畾涓洪噸澶嶆彁浜ょ殑鏁版嵁
- */
- private int intervalTime = 10;
-
- public void setIntervalTime(int intervalTime)
- {
- this.intervalTime = intervalTime;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public boolean isRepeatSubmit(HttpServletRequest request)
- {
- // 鏈鍙傛暟鍙婄郴缁熸椂闂
- String nowParams = JSONObject.toJSONString(request.getParameterMap());
- Map nowDataMap = new HashMap();
- nowDataMap.put(REPEAT_PARAMS, nowParams);
- nowDataMap.put(REPEAT_TIME, System.currentTimeMillis());
-
- // 璇锋眰鍦板潃锛堜綔涓哄瓨鏀緎ession鐨刱ey鍊硷級
- String url = request.getRequestURI();
-
- HttpSession session = request.getSession();
- Object sessionObj = session.getAttribute(SESSION_REPEAT_KEY);
- if (sessionObj != null)
- {
- Map sessionMap = (Map) sessionObj;
- if (sessionMap.containsKey(url))
- {
- Map preDataMap = (Map) sessionMap.get(url);
- if (compareParams(nowDataMap, preDataMap) && compareTime(nowDataMap, preDataMap))
- {
- return true;
- }
- }
- }
- Map sessionMap = new HashMap();
- sessionMap.put(url, nowDataMap);
- session.setAttribute(SESSION_REPEAT_KEY, sessionMap);
- return false;
- }
-
- /**
- * 鍒ゆ柇鍙傛暟鏄惁鐩稿悓
- */
- private boolean compareParams(Map nowMap, Map preMap)
- {
- String nowParams = (String) nowMap.get(REPEAT_PARAMS);
- String preParams = (String) preMap.get(REPEAT_PARAMS);
- return nowParams.equals(preParams);
- }
-
- /**
- * 鍒ゆ柇涓ゆ闂撮殧鏃堕棿
- */
- private boolean compareTime(Map nowMap, Map preMap)
- {
- long time1 = (Long) nowMap.get(REPEAT_TIME);
- long time2 = (Long) preMap.get(REPEAT_TIME);
- if ((time1 - time2) < (this.intervalTime * 1000))
- {
- return true;
- }
- return false;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/manager/AsyncManager.java b/ruoyi/src/main/java/com/ruoyi/framework/manager/AsyncManager.java
deleted file mode 100644
index 6ed6d5b7..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/manager/AsyncManager.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.ruoyi.framework.manager;
-
-import java.util.TimerTask;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import com.ruoyi.common.utils.Threads;
-import com.ruoyi.common.utils.spring.SpringUtils;
-
-/**
- * 寮傛浠诲姟绠＄悊鍣
- *
- * @author ruoyi
- */
-public class AsyncManager
-{
- /**
- * 鎿嶄綔寤惰繜10姣
- */
- private final int OPERATE_DELAY_TIME = 10;
-
- /**
- * 寮傛鎿嶄綔浠诲姟璋冨害绾跨▼姹
- */
- private ScheduledExecutorService executor = SpringUtils.getBean("scheduledExecutorService");
-
- /**
- * 鍗曚緥妯″紡
- */
- private AsyncManager(){}
-
- private static AsyncManager me = new AsyncManager();
-
- public static AsyncManager me()
- {
- return me;
- }
-
- /**
- * 鎵ц浠诲姟
- *
- * @param task 浠诲姟
- */
- public void execute(TimerTask task)
- {
- executor.schedule(task, OPERATE_DELAY_TIME, TimeUnit.MILLISECONDS);
- }
-
- /**
- * 鍋滄浠诲姟绾跨▼姹
- */
- public void shutdown()
- {
- Threads.shutdownAndAwaitTermination(executor);
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java b/ruoyi/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java
deleted file mode 100644
index 8d8fb5a3..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.ruoyi.framework.manager;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import javax.annotation.PreDestroy;
-
-/**
- * 纭繚搴旂敤閫鍑烘椂鑳藉叧闂悗鍙扮嚎绋
- *
- * @author ruoyi
- */
-@Component
-public class ShutdownManager
-{
- private static final Logger logger = LoggerFactory.getLogger("sys-user");
-
- @PreDestroy
- public void destroy()
- {
- shutdownAsyncManager();
- }
-
- /**
- * 鍋滄寮傛鎵ц浠诲姟
- */
- private void shutdownAsyncManager()
- {
- try
- {
- logger.info("====鍏抽棴鍚庡彴浠诲姟浠诲姟绾跨▼姹====");
- AsyncManager.me().shutdown();
- }
- catch (Exception e)
- {
- logger.error(e.getMessage(), e);
- }
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/ruoyi/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
deleted file mode 100644
index 0be7a307..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.ruoyi.framework.manager.factory;
-
-import java.util.TimerTask;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.utils.LogUtils;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.ip.AddressUtils;
-import com.ruoyi.common.utils.ip.IpUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.project.monitor.domain.SysLogininfor;
-import com.ruoyi.project.monitor.domain.SysOperLog;
-import com.ruoyi.project.monitor.service.ISysLogininforService;
-import com.ruoyi.project.monitor.service.ISysOperLogService;
-import eu.bitwalker.useragentutils.UserAgent;
-
-/**
- * 寮傛宸ュ巶锛堜骇鐢熶换鍔＄敤锛
- *
- * @author ruoyi
- */
-public class AsyncFactory
-{
- private static final Logger sys_user_logger = LoggerFactory.getLogger("sys-user");
-
- /**
- * 璁板綍鐧婚檰淇℃伅
- *
- * @param username 鐢ㄦ埛鍚
- * @param status 鐘舵
- * @param message 娑堟伅
- * @param args 鍒楄〃
- * @return 浠诲姟task
- */
- public static TimerTask recordLogininfor(final String username, final String status, final String message,
- final Object... args)
- {
- final UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));
- final String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
- return new TimerTask()
- {
- @Override
- public void run()
- {
- String address = AddressUtils.getRealAddressByIP(ip);
- StringBuilder s = new StringBuilder();
- s.append(LogUtils.getBlock(ip));
- s.append(address);
- s.append(LogUtils.getBlock(username));
- s.append(LogUtils.getBlock(status));
- s.append(LogUtils.getBlock(message));
- // 鎵撳嵃淇℃伅鍒版棩蹇
- sys_user_logger.info(s.toString(), args);
- // 鑾峰彇瀹㈡埛绔搷浣滅郴缁
- String os = userAgent.getOperatingSystem().getName();
- // 鑾峰彇瀹㈡埛绔祻瑙堝櫒
- String browser = userAgent.getBrowser().getName();
- // 灏佽瀵硅薄
- SysLogininfor logininfor = new SysLogininfor();
- logininfor.setUserName(username);
- logininfor.setIpaddr(ip);
- logininfor.setLoginLocation(address);
- logininfor.setBrowser(browser);
- logininfor.setOs(os);
- logininfor.setMsg(message);
- // 鏃ュ織鐘舵
- if (Constants.LOGIN_SUCCESS.equals(status) || Constants.LOGOUT.equals(status))
- {
- logininfor.setStatus(Constants.SUCCESS);
- }
- else if (Constants.LOGIN_FAIL.equals(status))
- {
- logininfor.setStatus(Constants.FAIL);
- }
- // 鎻掑叆鏁版嵁
- SpringUtils.getBean(ISysLogininforService.class).insertLogininfor(logininfor);
- }
- };
- }
-
- /**
- * 鎿嶄綔鏃ュ織璁板綍
- *
- * @param operLog 鎿嶄綔鏃ュ織淇℃伅
- * @return 浠诲姟task
- */
- public static TimerTask recordOper(final SysOperLog operLog)
- {
- return new TimerTask()
- {
- @Override
- public void run()
- {
- // 杩滅▼鏌ヨ鎿嶄綔鍦扮偣
- operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp()));
- SpringUtils.getBean(ISysOperLogService.class).insertOperlog(operLog);
- }
- };
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/redis/RedisCache.java b/ruoyi/src/main/java/com/ruoyi/framework/redis/RedisCache.java
deleted file mode 100644
index 1fa3eda8..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/redis/RedisCache.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package com.ruoyi.framework.redis;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.BoundSetOperations;
-import org.springframework.data.redis.core.HashOperations;
-import org.springframework.data.redis.core.ListOperations;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
-import org.springframework.stereotype.Component;
-
-/**
- * spring redis 宸ュ叿绫
- *
- * @author ruoyi
- **/
-@SuppressWarnings(value = { "unchecked", "rawtypes" })
-@Component
-public class RedisCache
-{
- @Autowired
- public RedisTemplate redisTemplate;
-
- /**
- * 缂撳瓨鍩烘湰鐨勫璞★紝Integer銆丼tring銆佸疄浣撶被绛
- *
- * @param key 缂撳瓨鐨勯敭鍊
- * @param value 缂撳瓨鐨勫
- * @return 缂撳瓨鐨勫璞
- */
- public ValueOperations setCacheObject(String key, T value)
- {
- ValueOperations operation = redisTemplate.opsForValue();
- operation.set(key, value);
- return operation;
- }
-
- /**
- * 缂撳瓨鍩烘湰鐨勫璞★紝Integer銆丼tring銆佸疄浣撶被绛
- *
- * @param key 缂撳瓨鐨勯敭鍊
- * @param value 缂撳瓨鐨勫
- * @param timeout 鏃堕棿
- * @param timeUnit 鏃堕棿棰楃矑搴
- * @return 缂撳瓨鐨勫璞
- */
- public ValueOperations setCacheObject(String key, T value, Integer timeout, TimeUnit timeUnit)
- {
- ValueOperations operation = redisTemplate.opsForValue();
- operation.set(key, value, timeout, timeUnit);
- return operation;
- }
-
- /**
- * 鑾峰緱缂撳瓨鐨勫熀鏈璞°
- *
- * @param key 缂撳瓨閿
- * @return 缂撳瓨閿煎搴旂殑鏁版嵁
- */
- public T getCacheObject(String key)
- {
- ValueOperations operation = redisTemplate.opsForValue();
- return operation.get(key);
- }
-
- /**
- * 鍒犻櫎鍗曚釜瀵硅薄
- *
- * @param key
- */
- public void deleteObject(String key)
- {
- redisTemplate.delete(key);
- }
-
- /**
- * 鍒犻櫎闆嗗悎瀵硅薄
- *
- * @param collection
- */
- public void deleteObject(Collection collection)
- {
- redisTemplate.delete(collection);
- }
-
- /**
- * 缂撳瓨List鏁版嵁
- *
- * @param key 缂撳瓨鐨勯敭鍊
- * @param dataList 寰呯紦瀛樼殑List鏁版嵁
- * @return 缂撳瓨鐨勫璞
- */
- public ListOperations setCacheList(String key, List dataList)
- {
- ListOperations listOperation = redisTemplate.opsForList();
- if (null != dataList)
- {
- int size = dataList.size();
- for (int i = 0; i < size; i++)
- {
- listOperation.leftPush(key, dataList.get(i));
- }
- }
- return listOperation;
- }
-
- /**
- * 鑾峰緱缂撳瓨鐨刲ist瀵硅薄
- *
- * @param key 缂撳瓨鐨勯敭鍊
- * @return 缂撳瓨閿煎搴旂殑鏁版嵁
- */
- public List getCacheList(String key)
- {
- List dataList = new ArrayList();
- ListOperations listOperation = redisTemplate.opsForList();
- Long size = listOperation.size(key);
-
- for (int i = 0; i < size; i++)
- {
- dataList.add(listOperation.index(key, i));
- }
- return dataList;
- }
-
- /**
- * 缂撳瓨Set
- *
- * @param key 缂撳瓨閿
- * @param dataSet 缂撳瓨鐨勬暟鎹
- * @return 缂撳瓨鏁版嵁鐨勫璞
- */
- public BoundSetOperations setCacheSet(String key, Set dataSet)
- {
- BoundSetOperations setOperation = redisTemplate.boundSetOps(key);
- Iterator it = dataSet.iterator();
- while (it.hasNext())
- {
- setOperation.add(it.next());
- }
- return setOperation;
- }
-
- /**
- * 鑾峰緱缂撳瓨鐨剆et
- *
- * @param key
- * @return
- */
- public Set getCacheSet(String key)
- {
- Set dataSet = new HashSet();
- BoundSetOperations operation = redisTemplate.boundSetOps(key);
- dataSet = operation.members();
- return dataSet;
- }
-
- /**
- * 缂撳瓨Map
- *
- * @param key
- * @param dataMap
- * @return
- */
- public HashOperations setCacheMap(String key, Map dataMap)
- {
- HashOperations hashOperations = redisTemplate.opsForHash();
- if (null != dataMap)
- {
- for (Map.Entry entry : dataMap.entrySet())
- {
- hashOperations.put(key, entry.getKey(), entry.getValue());
- }
- }
- return hashOperations;
- }
-
- /**
- * 鑾峰緱缂撳瓨鐨凪ap
- *
- * @param key
- * @return
- */
- public Map getCacheMap(String key)
- {
- Map map = redisTemplate.opsForHash().entries(key);
- return map;
- }
-
- /**
- * 鑾峰緱缂撳瓨鐨勫熀鏈璞″垪琛
- *
- * @param pattern 瀛楃涓插墠缂
- * @return 瀵硅薄鍒楄〃
- */
- public Collection keys(String pattern)
- {
- return redisTemplate.keys(pattern);
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/security/LoginUser.java b/ruoyi/src/main/java/com/ruoyi/framework/security/LoginUser.java
deleted file mode 100644
index 6b2ff094..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/security/LoginUser.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package com.ruoyi.framework.security;
-
-import java.util.Collection;
-import java.util.Set;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.ruoyi.project.system.domain.SysUser;
-
-/**
- * 鐧诲綍鐢ㄦ埛韬唤鏉冮檺
- *
- * @author ruoyi
- */
-public class LoginUser implements UserDetails
-{
- private static final long serialVersionUID = 1L;
-
- /**
- * 鐢ㄦ埛鍞竴鏍囪瘑
- */
- private String token;
-
- /**
- * 鐧婚檰鏃堕棿
- */
- private Long loginTime;
-
- /**
- * 杩囨湡鏃堕棿
- */
- private Long expireTime;
-
- /**
- * 鐧诲綍IP鍦板潃
- */
- private String ipaddr;
-
- /**
- * 鐧诲綍鍦扮偣
- */
- private String loginLocation;
-
- /**
- * 娴忚鍣ㄧ被鍨
- */
- private String browser;
-
- /**
- * 鎿嶄綔绯荤粺
- */
- private String os;
-
- /**
- * 鏉冮檺鍒楄〃
- */
- private Set permissions;
-
- /**
- * 鐢ㄦ埛淇℃伅
- */
- private SysUser user;
-
- public String getToken()
- {
- return token;
- }
-
- public void setToken(String token)
- {
- this.token = token;
- }
-
- public LoginUser()
- {
- }
-
- public LoginUser(SysUser user, Set permissions)
- {
- this.user = user;
- this.permissions = permissions;
- }
-
- @JsonIgnore
- @Override
- public String getPassword()
- {
- return user.getPassword();
- }
-
- @Override
- public String getUsername()
- {
- return user.getUserName();
- }
-
- /**
- * 璐︽埛鏄惁鏈繃鏈,杩囨湡鏃犳硶楠岃瘉
- */
- @JsonIgnore
- @Override
- public boolean isAccountNonExpired()
- {
- return true;
- }
-
- /**
- * 鎸囧畾鐢ㄦ埛鏄惁瑙ｉ攣,閿佸畾鐨勭敤鎴锋棤娉曡繘琛岃韩浠介獙璇
- *
- * @return
- */
- @JsonIgnore
- @Override
- public boolean isAccountNonLocked()
- {
- return true;
- }
-
- /**
- * 鎸囩ず鏄惁宸茶繃鏈熺殑鐢ㄦ埛鐨勫嚟鎹(瀵嗙爜),杩囨湡鐨勫嚟鎹槻姝㈣璇
- *
- * @return
- */
- @JsonIgnore
- @Override
- public boolean isCredentialsNonExpired()
- {
- return true;
- }
-
- /**
- * 鏄惁鍙敤 ,绂佺敤鐨勭敤鎴蜂笉鑳借韩浠介獙璇
- *
- * @return
- */
- @JsonIgnore
- @Override
- public boolean isEnabled()
- {
- return true;
- }
-
- public Long getLoginTime()
- {
- return loginTime;
- }
-
- public void setLoginTime(Long loginTime)
- {
- this.loginTime = loginTime;
- }
-
- public String getIpaddr()
- {
- return ipaddr;
- }
-
- public void setIpaddr(String ipaddr)
- {
- this.ipaddr = ipaddr;
- }
-
- public String getLoginLocation()
- {
- return loginLocation;
- }
-
- public void setLoginLocation(String loginLocation)
- {
- this.loginLocation = loginLocation;
- }
-
- public String getBrowser()
- {
- return browser;
- }
-
- public void setBrowser(String browser)
- {
- this.browser = browser;
- }
-
- public String getOs()
- {
- return os;
- }
-
- public void setOs(String os)
- {
- this.os = os;
- }
-
- public Long getExpireTime()
- {
- return expireTime;
- }
-
- public void setExpireTime(Long expireTime)
- {
- this.expireTime = expireTime;
- }
-
- public Set getPermissions()
- {
- return permissions;
- }
-
- public void setPermissions(Set permissions)
- {
- this.permissions = permissions;
- }
-
- public SysUser getUser()
- {
- return user;
- }
-
- public void setUser(SysUser user)
- {
- this.user = user;
- }
-
- @Override
- public Collection getAuthorities()
- {
- return null;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java b/ruoyi/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
deleted file mode 100644
index ede50bef..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.ruoyi.framework.security.filter;
-
-import java.io.IOException;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
-import org.springframework.stereotype.Component;
-import org.springframework.web.filter.OncePerRequestFilter;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.security.service.TokenService;
-
-/**
- * token杩囨护鍣 楠岃瘉token鏈夋晥鎬
- *
- * @author ruoyi
- */
-@Component
-public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
-{
- @Autowired
- private TokenService tokenService;
-
- @Override
- protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
- throws ServletException, IOException
- {
- LoginUser loginUser = tokenService.getLoginUser(request);
- if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication()))
- {
- tokenService.verifyToken(loginUser);
- UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities());
- authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
- SecurityContextHolder.getContext().setAuthentication(authenticationToken);
- }
- chain.doFilter(request, response);
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java b/ruoyi/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
deleted file mode 100644
index 995b1f36..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.ruoyi.framework.security.handle;
-
-import java.io.IOException;
-import java.io.Serializable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.AuthenticationEntryPoint;
-import org.springframework.stereotype.Component;
-import com.alibaba.fastjson.JSON;
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.domain.AjaxResult;
-
-/**
- * 璁よ瘉澶辫触澶勭悊绫 杩斿洖鏈巿鏉
- *
- * @author ruoyi
- */
-@Component
-public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, Serializable
-{
- private static final long serialVersionUID = -8970718410437077606L;
-
- @Override
- public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e)
- throws IOException
- {
- int code = HttpStatus.UNAUTHORIZED;
- String msg = StringUtils.format("璇锋眰璁块棶锛歿}锛岃璇佸け璐ワ紝鏃犳硶璁块棶绯荤粺璧勬簮", request.getRequestURI());
- ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(code, msg)));
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java b/ruoyi/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
deleted file mode 100644
index c2cc60ba..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.ruoyi.framework.security.handle;
-
-import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
-import com.alibaba.fastjson.JSON;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.manager.AsyncManager;
-import com.ruoyi.framework.manager.factory.AsyncFactory;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.security.service.TokenService;
-import com.ruoyi.framework.web.domain.AjaxResult;
-
-/**
- * 鑷畾涔夐鍑哄鐞嗙被 杩斿洖鎴愬姛
- *
- * @author ruoyi
- */
-@Configuration
-public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler
-{
- @Autowired
- private TokenService tokenService;
-
- /**
- * 閫鍑哄鐞
- *
- * @return
- */
- @Override
- public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication)
- throws IOException, ServletException
- {
- LoginUser loginUser = tokenService.getLoginUser(request);
- if (StringUtils.isNotNull(loginUser))
- {
- String userName = loginUser.getUsername();
- // 鍒犻櫎鐢ㄦ埛缂撳瓨璁板綍
- tokenService.delLoginUser(loginUser.getToken());
- // 璁板綍鐢ㄦ埛閫鍑烘棩蹇
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, "閫鍑烘垚鍔"));
- }
- ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(HttpStatus.SUCCESS, "閫鍑烘垚鍔")));
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/security/service/PermissionService.java b/ruoyi/src/main/java/com/ruoyi/framework/security/service/PermissionService.java
deleted file mode 100644
index c0b40a67..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/security/service/PermissionService.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package com.ruoyi.framework.security.service;
-
-import java.util.Set;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.project.system.domain.SysRole;
-
-/**
- * RuoYi棣栧垱 鑷畾涔夋潈闄愬疄鐜帮紝ss鍙栬嚜SpringSecurity棣栧瓧姣
- *
- * @author ruoyi
- */
-@Service("ss")
-public class PermissionService
-{
- /** 鎵鏈夋潈闄愭爣璇 */
- private static final String ALL_PERMISSION = "*:*:*";
-
- /** 绠＄悊鍛樿鑹叉潈闄愭爣璇 */
- private static final String SUPER_ADMIN = "admin";
-
- private static final String ROLE_DELIMETER = ",";
-
- private static final String PERMISSION_DELIMETER = ",";
-
- @Autowired
- private TokenService tokenService;
-
- /**
- * 楠岃瘉鐢ㄦ埛鏄惁鍏峰鏌愭潈闄
- *
- * @param permission 鏉冮檺瀛楃涓
- * @return 鐢ㄦ埛鏄惁鍏峰鏌愭潈闄
- */
- public boolean hasPermi(String permission)
- {
- if (StringUtils.isEmpty(permission))
- {
- return false;
- }
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions()))
- {
- return false;
- }
- return hasPermissions(loginUser.getPermissions(), permission);
- }
-
- /**
- * 楠岃瘉鐢ㄦ埛鏄惁涓嶅叿澶囨煇鏉冮檺锛屼笌 hasPermi閫昏緫鐩稿弽
- *
- * @param permission 鏉冮檺瀛楃涓
- * @return 鐢ㄦ埛鏄惁涓嶅叿澶囨煇鏉冮檺
- */
- public boolean lacksPermi(String permission)
- {
- return hasPermi(permission) != true;
- }
-
- /**
- * 楠岃瘉鐢ㄦ埛鏄惁鍏锋湁浠ヤ笅浠绘剰涓涓潈闄
- *
- * @param permissions 浠 PERMISSION_NAMES_DELIMETER 涓哄垎闅旂鐨勬潈闄愬垪琛
- * @return 鐢ㄦ埛鏄惁鍏锋湁浠ヤ笅浠绘剰涓涓潈闄
- */
- public boolean hasAnyPermi(String permissions)
- {
- if (StringUtils.isEmpty(permissions))
- {
- return false;
- }
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions()))
- {
- return false;
- }
- Set authorities = loginUser.getPermissions();
- for (String permission : permissions.split(PERMISSION_DELIMETER))
- {
- if (permission != null && hasPermissions(authorities, permission))
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * 鍒ゆ柇鐢ㄦ埛鏄惁鎷ユ湁鏌愪釜瑙掕壊
- *
- * @param role 瑙掕壊瀛楃涓
- * @return 鐢ㄦ埛鏄惁鍏峰鏌愯鑹
- */
- public boolean hasRole(String role)
- {
- if (StringUtils.isEmpty(role))
- {
- return false;
- }
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles()))
- {
- return false;
- }
- for (SysRole sysRole : loginUser.getUser().getRoles())
- {
- String roleKey = sysRole.getRoleKey();
- if (SUPER_ADMIN.contains(roleKey) || roleKey.contains(StringUtils.trim(role)))
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * 楠岃瘉鐢ㄦ埛鏄惁涓嶅叿澶囨煇瑙掕壊锛屼笌 isRole閫昏緫鐩稿弽銆
- *
- * @param role 瑙掕壊鍚嶇О
- * @return 鐢ㄦ埛鏄惁涓嶅叿澶囨煇瑙掕壊
- */
- public boolean lacksRole(String role)
- {
- return hasRole(role) != true;
- }
-
- /**
- * 楠岃瘉鐢ㄦ埛鏄惁鍏锋湁浠ヤ笅浠绘剰涓涓鑹
- *
- * @param roles 浠 ROLE_NAMES_DELIMETER 涓哄垎闅旂鐨勮鑹插垪琛
- * @return 鐢ㄦ埛鏄惁鍏锋湁浠ヤ笅浠绘剰涓涓鑹
- */
- public boolean hasAnyRoles(String roles)
- {
- if (StringUtils.isEmpty(roles))
- {
- return false;
- }
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles()))
- {
- return false;
- }
- for (String role : roles.split(ROLE_DELIMETER))
- {
- if (hasRole(role))
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * 鍒ゆ柇鏄惁鍖呭惈鏉冮檺
- *
- * @param permissions 鏉冮檺鍒楄〃
- * @param permission 鏉冮檺瀛楃涓
- * @return 鐢ㄦ埛鏄惁鍏峰鏌愭潈闄
- */
- private boolean hasPermissions(Set permissions, String permission)
- {
- return permissions.contains(ALL_PERMISSION) || permissions.contains(StringUtils.trim(permission));
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java b/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
deleted file mode 100644
index 4f99044e..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.ruoyi.framework.security.service;
-
-import javax.annotation.Resource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Component;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.exception.CustomException;
-import com.ruoyi.common.exception.user.CaptchaException;
-import com.ruoyi.common.exception.user.CaptchaExpireException;
-import com.ruoyi.common.exception.user.UserPasswordNotMatchException;
-import com.ruoyi.common.utils.MessageUtils;
-import com.ruoyi.framework.manager.AsyncManager;
-import com.ruoyi.framework.manager.factory.AsyncFactory;
-import com.ruoyi.framework.redis.RedisCache;
-import com.ruoyi.framework.security.LoginUser;
-
-/**
- * 鐧诲綍鏍￠獙鏂规硶
- *
- * @author ruoyi
- */
-@Component
-public class SysLoginService
-{
- @Autowired
- private TokenService tokenService;
-
- @Resource
- private AuthenticationManager authenticationManager;
-
- @Autowired
- private RedisCache redisCache;
-
- /**
- * 鐧诲綍楠岃瘉
- *
- * @param username 鐢ㄦ埛鍚
- * @param password 瀵嗙爜
- * @param captcha 楠岃瘉鐮
- * @param uuid 鍞竴鏍囪瘑
- * @return 缁撴灉
- */
- public String login(String username, String password, String code, String uuid)
- {
- String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
- String captcha = redisCache.getCacheObject(verifyKey);
- redisCache.deleteObject(verifyKey);
- if (captcha == null)
- {
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")));
- throw new CaptchaExpireException();
- }
- if (!code.equalsIgnoreCase(captcha))
- {
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
- throw new CaptchaException();
- }
- // 鐢ㄦ埛楠岃瘉
- Authentication authentication = null;
- try
- {
- // 璇ユ柟娉曚細鍘昏皟鐢║serDetailsServiceImpl.loadUserByUsername
- authentication = authenticationManager
- .authenticate(new UsernamePasswordAuthenticationToken(username, password));
- }
- catch (Exception e)
- {
- if (e instanceof BadCredentialsException)
- {
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
- throw new UserPasswordNotMatchException();
- }
- else
- {
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage()));
- throw new CustomException(e.getMessage());
- }
- }
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
- LoginUser loginUser = (LoginUser) authentication.getPrincipal();
- // 鐢熸垚token
- return tokenService.createToken(loginUser);
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java b/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
deleted file mode 100644
index 1bdb667f..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.ruoyi.framework.security.service;
-
-import java.util.HashSet;
-import java.util.Set;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import com.ruoyi.project.system.domain.SysUser;
-import com.ruoyi.project.system.service.ISysMenuService;
-import com.ruoyi.project.system.service.ISysRoleService;
-
-/**
- * 鐢ㄦ埛鏉冮檺澶勭悊
- *
- * @author ruoyi
- */
-@Component
-public class SysPermissionService
-{
- @Autowired
- private ISysRoleService roleService;
-
- @Autowired
- private ISysMenuService menuService;
-
- /**
- * 鑾峰彇瑙掕壊鏁版嵁鏉冮檺
- *
- * @param user 鐢ㄦ埛淇℃伅
- * @return 瑙掕壊鏉冮檺淇℃伅
- */
- public Set getRolePermission(SysUser user)
- {
- Set roles = new HashSet();
- // 绠＄悊鍛樻嫢鏈夋墍鏈夋潈闄
- if (user.isAdmin())
- {
- roles.add("admin");
- }
- else
- {
- roles.addAll(roleService.selectRolePermissionByUserId(user.getUserId()));
- }
- return roles;
- }
-
- /**
- * 鑾峰彇鑿滃崟鏁版嵁鏉冮檺
- *
- * @param user 鐢ㄦ埛淇℃伅
- * @return 鑿滃崟鏉冮檺淇℃伅
- */
- public Set getMenuPermission(SysUser user)
- {
- Set roles = new HashSet();
- // 绠＄悊鍛樻嫢鏈夋墍鏈夋潈闄
- if (user.isAdmin())
- {
- roles.add("*:*:*");
- }
- else
- {
- roles.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
- }
- return roles;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java b/ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
deleted file mode 100644
index 3ecbc000..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
+++ /dev/null
@@ -1,220 +0,0 @@
-package com.ruoyi.framework.security.service;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.utils.IdUtils;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.ip.AddressUtils;
-import com.ruoyi.common.utils.ip.IpUtils;
-import com.ruoyi.framework.redis.RedisCache;
-import com.ruoyi.framework.security.LoginUser;
-import eu.bitwalker.useragentutils.UserAgent;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
-
-/**
- * token楠岃瘉澶勭悊
- *
- * @author ruoyi
- */
-@Component
-public class TokenService
-{
- // 浠ょ墝鑷畾涔夋爣璇
- @Value("${token.header}")
- private String header;
-
- // 浠ょ墝绉橀挜
- @Value("${token.secret}")
- private String secret;
-
- // 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛
- @Value("${token.expireTime}")
- private int expireTime;
-
- protected static final long MILLIS_SECOND = 1000;
-
- protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND;
-
- private static final Long MILLIS_MINUTE_TEN = 20 * 60 * 1000L;
-
- @Autowired
- private RedisCache redisCache;
-
- /**
- * 鑾峰彇鐢ㄦ埛韬唤淇℃伅
- *
- * @return 鐢ㄦ埛淇℃伅
- */
- public LoginUser getLoginUser(HttpServletRequest request)
- {
- // 鑾峰彇璇锋眰鎼哄甫鐨勪护鐗
- String token = getToken(request);
- if (StringUtils.isNotEmpty(token))
- {
- Claims claims = parseToken(token);
- // 瑙ｆ瀽瀵瑰簲鐨勬潈闄愪互鍙婄敤鎴蜂俊鎭
- String uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
- String userKey = getTokenKey(uuid);
- LoginUser user = redisCache.getCacheObject(userKey);
- return user;
- }
- return null;
- }
-
- /**
- * 璁剧疆鐢ㄦ埛韬唤淇℃伅
- */
- public void setLoginUser(LoginUser loginUser)
- {
- if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken()))
- {
- String userKey = getTokenKey(loginUser.getToken());
- redisCache.setCacheObject(userKey, loginUser);
- }
- }
-
- /**
- * 鍒犻櫎鐢ㄦ埛韬唤淇℃伅
- */
- public void delLoginUser(String token)
- {
- if (StringUtils.isNotEmpty(token))
- {
- String userKey = getTokenKey(token);
- redisCache.deleteObject(userKey);
- }
- }
-
- /**
- * 鍒涘缓浠ょ墝
- *
- * @param loginUser 鐢ㄦ埛淇℃伅
- * @return 浠ょ墝
- */
- public String createToken(LoginUser loginUser)
- {
- String token = IdUtils.fastUUID();
- loginUser.setToken(token);
- setUserAgent(loginUser);
- refreshToken(loginUser);
-
- Map claims = new HashMap<>();
- claims.put(Constants.LOGIN_USER_KEY, token);
- return createToken(claims);
- }
-
- /**
- * 楠岃瘉浠ょ墝鏈夋晥鏈燂紝鐩稿樊涓嶈冻20鍒嗛挓锛岃嚜鍔ㄥ埛鏂扮紦瀛
- *
- * @param token 浠ょ墝
- * @return 浠ょ墝
- */
- public void verifyToken(LoginUser loginUser)
- {
- long expireTime = loginUser.getExpireTime();
- long currentTime = System.currentTimeMillis();
- if (expireTime - currentTime <= MILLIS_MINUTE_TEN)
- {
- refreshToken(loginUser);
- }
- }
-
- /**
- * 鍒锋柊浠ょ墝鏈夋晥鏈
- *
- * @param loginUser 鐧诲綍淇℃伅
- */
- public void refreshToken(LoginUser loginUser)
- {
- loginUser.setLoginTime(System.currentTimeMillis());
- loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
- // 鏍规嵁uuid灏唋oginUser缂撳瓨
- String userKey = getTokenKey(loginUser.getToken());
- redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
- }
-
- /**
- * 璁剧疆鐢ㄦ埛浠ｇ悊淇℃伅
- *
- * @param loginUser 鐧诲綍淇℃伅
- */
- public void setUserAgent(LoginUser loginUser)
- {
- UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));
- String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
- loginUser.setIpaddr(ip);
- loginUser.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
- loginUser.setBrowser(userAgent.getBrowser().getName());
- loginUser.setOs(userAgent.getOperatingSystem().getName());
- }
-
- /**
- * 浠庢暟鎹０鏄庣敓鎴愪护鐗
- *
- * @param claims 鏁版嵁澹版槑
- * @return 浠ょ墝
- */
- private String createToken(Map claims)
- {
- String token = Jwts.builder()
- .setClaims(claims)
- .signWith(SignatureAlgorithm.HS512, secret).compact();
- return token;
- }
-
- /**
- * 浠庝护鐗屼腑鑾峰彇鏁版嵁澹版槑
- *
- * @param token 浠ょ墝
- * @return 鏁版嵁澹版槑
- */
- private Claims parseToken(String token)
- {
- return Jwts.parser()
- .setSigningKey(secret)
- .parseClaimsJws(token)
- .getBody();
- }
-
- /**
- * 浠庝护鐗屼腑鑾峰彇鐢ㄦ埛鍚
- *
- * @param token 浠ょ墝
- * @return 鐢ㄦ埛鍚
- */
- public String getUsernameFromToken(String token)
- {
- Claims claims = parseToken(token);
- return claims.getSubject();
- }
-
- /**
- * 鑾峰彇璇锋眰token
- *
- * @param request
- * @return token
- */
- private String getToken(HttpServletRequest request)
- {
- String token = request.getHeader(header);
- if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX))
- {
- token = token.replace(Constants.TOKEN_PREFIX, "");
- }
- return token;
- }
-
- private String getTokenKey(String uuid)
- {
- return Constants.LOGIN_TOKEN_KEY + uuid;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java
deleted file mode 100644
index 2a8c6927..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.ruoyi.framework.security.service;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
-import com.ruoyi.common.enums.UserStatus;
-import com.ruoyi.common.exception.BaseException;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.project.system.domain.SysUser;
-import com.ruoyi.project.system.service.ISysUserService;
-
-/**
- * 鐢ㄦ埛楠岃瘉澶勭悊
- *
- * @author ruoyi
- */
-@Service
-public class UserDetailsServiceImpl implements UserDetailsService
-{
- private static final Logger log = LoggerFactory.getLogger(UserDetailsServiceImpl.class);
-
- @Autowired
- private ISysUserService userService;
-
- @Autowired
- private SysPermissionService permissionService;
-
- @Override
- public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
- {
- SysUser user = userService.selectUserByUserName(username);
- if (StringUtils.isNull(user))
- {
- log.info("鐧诲綍鐢ㄦ埛锛歿} 涓嶅瓨鍦.", username);
- throw new UsernameNotFoundException("鐧诲綍鐢ㄦ埛锛" + username + " 涓嶅瓨鍦");
- }
- else if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
- {
- log.info("鐧诲綍鐢ㄦ埛锛歿} 宸茶鍒犻櫎.", username);
- throw new BaseException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛" + username + " 宸茶鍒犻櫎");
- }
- else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
- {
- log.info("鐧诲綍鐢ㄦ埛锛歿} 宸茶鍋滅敤.", username);
- throw new BaseException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛" + username + " 宸插仠鐢");
- }
-
- return createLoginUser(user);
- }
-
- public UserDetails createLoginUser(SysUser user)
- {
- return new LoginUser(user, permissionService.getMenuPermission(user));
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/web/controller/BaseController.java b/ruoyi/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
deleted file mode 100644
index ccc60a37..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.ruoyi.framework.web.controller;
-
-import java.beans.PropertyEditorSupport;
-import java.util.Date;
-import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.sql.SqlUtil;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.PageDomain;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.framework.web.page.TableSupport;
-
-/**
- * web灞傞氱敤鏁版嵁澶勭悊
- *
- * @author ruoyi
- */
-public class BaseController
-{
- protected final Logger logger = LoggerFactory.getLogger(BaseController.class);
-
- /**
- * 灏嗗墠鍙颁紶閫掕繃鏉ョ殑鏃ユ湡鏍煎紡鐨勫瓧绗︿覆锛岃嚜鍔ㄨ浆鍖栦负Date绫诲瀷
- */
- @InitBinder
- public void initBinder(WebDataBinder binder)
- {
- // Date 绫诲瀷杞崲
- binder.registerCustomEditor(Date.class, new PropertyEditorSupport()
- {
- @Override
- public void setAsText(String text)
- {
- setValue(DateUtils.parseDate(text));
- }
- });
- }
-
- /**
- * 璁剧疆璇锋眰鍒嗛〉鏁版嵁
- */
- protected void startPage()
- {
- PageDomain pageDomain = TableSupport.buildPageRequest();
- Integer pageNum = pageDomain.getPageNum();
- Integer pageSize = pageDomain.getPageSize();
- if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))
- {
- String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
- PageHelper.startPage(pageNum, pageSize, orderBy);
- }
- }
-
- /**
- * 鍝嶅簲璇锋眰鍒嗛〉鏁版嵁
- */
- @SuppressWarnings({ "rawtypes", "unchecked" })
- protected TableDataInfo getDataTable(List list)
- {
- TableDataInfo rspData = new TableDataInfo();
- rspData.setCode(HttpStatus.SUCCESS);
- rspData.setRows(list);
- rspData.setTotal(new PageInfo(list).getTotal());
- return rspData;
- }
-
- /**
- * 鍝嶅簲杩斿洖缁撴灉
- *
- * @param rows 褰卞搷琛屾暟
- * @return 鎿嶄綔缁撴灉
- */
- protected AjaxResult toAjax(int rows)
- {
- return rows > 0 ? AjaxResult.success() : AjaxResult.error();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java
deleted file mode 100644
index 5c551bd7..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.ruoyi.framework.web.domain;
-
-import java.util.HashMap;
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * 鎿嶄綔娑堟伅鎻愰啋
- *
- * @author ruoyi
- */
-public class AjaxResult extends HashMap
-{
- private static final long serialVersionUID = 1L;
-
- /** 鐘舵佺爜 */
- public static final String CODE_TAG = "code";
-
- /** 杩斿洖鍐呭 */
- public static final String MSG_TAG = "msg";
-
- /** 鏁版嵁瀵硅薄 */
- public static final String DATA_TAG = "data";
-
- /**
- * 鍒濆鍖栦竴涓柊鍒涘缓鐨 AjaxResult 瀵硅薄锛屼娇鍏惰〃绀轰竴涓┖娑堟伅銆
- */
- public AjaxResult()
- {
- }
-
- /**
- * 鍒濆鍖栦竴涓柊鍒涘缓鐨 AjaxResult 瀵硅薄
- *
- * @param code 鐘舵佺爜
- * @param msg 杩斿洖鍐呭
- */
- public AjaxResult(int code, String msg)
- {
- super.put(CODE_TAG, code);
- super.put(MSG_TAG, msg);
- }
-
- /**
- * 鍒濆鍖栦竴涓柊鍒涘缓鐨 AjaxResult 瀵硅薄
- *
- * @param code 鐘舵佺爜
- * @param msg 杩斿洖鍐呭
- * @param data 鏁版嵁瀵硅薄
- */
- public AjaxResult(int code, String msg, Object data)
- {
- super.put(CODE_TAG, code);
- super.put(MSG_TAG, msg);
- if (StringUtils.isNotNull(data))
- {
- super.put(DATA_TAG, data);
- }
- }
-
- /**
- * 杩斿洖鎴愬姛娑堟伅
- *
- * @return 鎴愬姛娑堟伅
- */
- public static AjaxResult success()
- {
- return AjaxResult.success("鎿嶄綔鎴愬姛");
- }
-
- /**
- * 杩斿洖鎴愬姛鏁版嵁
- *
- * @return 鎴愬姛娑堟伅
- */
- public static AjaxResult success(Object data)
- {
- return AjaxResult.success("鎿嶄綔鎴愬姛", data);
- }
-
- /**
- * 杩斿洖鎴愬姛娑堟伅
- *
- * @param msg 杩斿洖鍐呭
- * @return 鎴愬姛娑堟伅
- */
- public static AjaxResult success(String msg)
- {
- return AjaxResult.success(msg, null);
- }
-
- /**
- * 杩斿洖鎴愬姛娑堟伅
- *
- * @param msg 杩斿洖鍐呭
- * @param data 鏁版嵁瀵硅薄
- * @return 鎴愬姛娑堟伅
- */
- public static AjaxResult success(String msg, Object data)
- {
- return new AjaxResult(HttpStatus.SUCCESS, msg, data);
- }
-
- /**
- * 杩斿洖閿欒娑堟伅
- *
- * @return
- */
- public static AjaxResult error()
- {
- return AjaxResult.error("鎿嶄綔澶辫触");
- }
-
- /**
- * 杩斿洖閿欒娑堟伅
- *
- * @param msg 杩斿洖鍐呭
- * @return 璀﹀憡娑堟伅
- */
- public static AjaxResult error(String msg)
- {
- return AjaxResult.error(msg, null);
- }
-
- /**
- * 杩斿洖閿欒娑堟伅
- *
- * @param msg 杩斿洖鍐呭
- * @param data 鏁版嵁瀵硅薄
- * @return 璀﹀憡娑堟伅
- */
- public static AjaxResult error(String msg, Object data)
- {
- return new AjaxResult(HttpStatus.ERROR, msg, data);
- }
-
- /**
- * 杩斿洖閿欒娑堟伅
- *
- * @param code 鐘舵佺爜
- * @param msg 杩斿洖鍐呭
- * @return 璀﹀憡娑堟伅
- */
- public static AjaxResult error(int code, String msg)
- {
- return new AjaxResult(code, msg, null);
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
deleted file mode 100644
index 6ed760cb..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package com.ruoyi.framework.web.domain;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-/**
- * Entity鍩虹被
- *
- * @author ruoyi
- */
-public class BaseEntity implements Serializable
-{
- private static final long serialVersionUID = 1L;
-
- /** 鎼滅储鍊 */
- private String searchValue;
-
- /** 鍒涘缓鑰 */
- private String createBy;
-
- /** 鍒涘缓鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /** 鏇存柊鑰 */
- private String updateBy;
-
- /** 鏇存柊鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /** 澶囨敞 */
- private String remark;
-
- /** 鏁版嵁鏉冮檺 */
- private String dataScope;
-
- /** 寮濮嬫椂闂 */
- @JsonIgnore
- private String beginTime;
-
- /** 缁撴潫鏃堕棿 */
- @JsonIgnore
- private String endTime;
-
- /** 璇锋眰鍙傛暟 */
- private Map params;
-
- public String getSearchValue()
- {
- return searchValue;
- }
-
- public void setSearchValue(String searchValue)
- {
- this.searchValue = searchValue;
- }
-
- public String getCreateBy()
- {
- return createBy;
- }
-
- public void setCreateBy(String createBy)
- {
- this.createBy = createBy;
- }
-
- public Date getCreateTime()
- {
- return createTime;
- }
-
- public void setCreateTime(Date createTime)
- {
- this.createTime = createTime;
- }
-
- public String getUpdateBy()
- {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy)
- {
- this.updateBy = updateBy;
- }
-
- public Date getUpdateTime()
- {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime)
- {
- this.updateTime = updateTime;
- }
-
- public String getRemark()
- {
- return remark;
- }
-
- public void setRemark(String remark)
- {
- this.remark = remark;
- }
-
- public String getDataScope()
- {
- return dataScope;
- }
-
- public void setDataScope(String dataScope)
- {
- this.dataScope = dataScope;
- }
-
- public String getBeginTime()
- {
- return beginTime;
- }
-
- public void setBeginTime(String beginTime)
- {
- this.beginTime = beginTime;
- }
-
- public String getEndTime()
- {
- return endTime;
- }
-
- public void setEndTime(String endTime)
- {
- this.endTime = endTime;
- }
-
- public Map getParams()
- {
- if (params == null)
- {
- params = new HashMap<>();
- }
- return params;
- }
-
- public void setParams(Map params)
- {
- this.params = params;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/Server.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/Server.java
deleted file mode 100644
index 79e174b5..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/Server.java
+++ /dev/null
@@ -1,241 +0,0 @@
-package com.ruoyi.framework.web.domain;
-
-import java.net.UnknownHostException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Properties;
-import com.ruoyi.common.utils.Arith;
-import com.ruoyi.common.utils.ip.IpUtils;
-import com.ruoyi.framework.web.domain.server.Cpu;
-import com.ruoyi.framework.web.domain.server.Jvm;
-import com.ruoyi.framework.web.domain.server.Mem;
-import com.ruoyi.framework.web.domain.server.Sys;
-import com.ruoyi.framework.web.domain.server.SysFile;
-import oshi.SystemInfo;
-import oshi.hardware.CentralProcessor;
-import oshi.hardware.CentralProcessor.TickType;
-import oshi.hardware.GlobalMemory;
-import oshi.hardware.HardwareAbstractionLayer;
-import oshi.software.os.FileSystem;
-import oshi.software.os.OSFileStore;
-import oshi.software.os.OperatingSystem;
-import oshi.util.Util;
-
-/**
- * 鏈嶅姟鍣ㄧ浉鍏充俊鎭
- *
- * @author ruoyi
- */
-public class Server
-{
-
- private static final int OSHI_WAIT_SECOND = 1000;
-
- /**
- * CPU鐩稿叧淇℃伅
- */
- private Cpu cpu = new Cpu();
-
- /**
- * 鍏у瓨鐩稿叧淇℃伅
- */
- private Mem mem = new Mem();
-
- /**
- * JVM鐩稿叧淇℃伅
- */
- private Jvm jvm = new Jvm();
-
- /**
- * 鏈嶅姟鍣ㄧ浉鍏充俊鎭
- */
- private Sys sys = new Sys();
-
- /**
- * 纾佺洏鐩稿叧淇℃伅
- */
- private List sysFiles = new LinkedList();
-
- public Cpu getCpu()
- {
- return cpu;
- }
-
- public void setCpu(Cpu cpu)
- {
- this.cpu = cpu;
- }
-
- public Mem getMem()
- {
- return mem;
- }
-
- public void setMem(Mem mem)
- {
- this.mem = mem;
- }
-
- public Jvm getJvm()
- {
- return jvm;
- }
-
- public void setJvm(Jvm jvm)
- {
- this.jvm = jvm;
- }
-
- public Sys getSys()
- {
- return sys;
- }
-
- public void setSys(Sys sys)
- {
- this.sys = sys;
- }
-
- public List getSysFiles()
- {
- return sysFiles;
- }
-
- public void setSysFiles(List sysFiles)
- {
- this.sysFiles = sysFiles;
- }
-
- public void copyTo() throws Exception
- {
- SystemInfo si = new SystemInfo();
- HardwareAbstractionLayer hal = si.getHardware();
-
- setCpuInfo(hal.getProcessor());
-
- setMemInfo(hal.getMemory());
-
- setSysInfo();
-
- setJvmInfo();
-
- setSysFiles(si.getOperatingSystem());
- }
-
- /**
- * 璁剧疆CPU淇℃伅
- */
- private void setCpuInfo(CentralProcessor processor)
- {
- // CPU淇℃伅
- long[] prevTicks = processor.getSystemCpuLoadTicks();
- Util.sleep(OSHI_WAIT_SECOND);
- long[] ticks = processor.getSystemCpuLoadTicks();
- long nice = ticks[TickType.NICE.getIndex()] - prevTicks[TickType.NICE.getIndex()];
- long irq = ticks[TickType.IRQ.getIndex()] - prevTicks[TickType.IRQ.getIndex()];
- long softirq = ticks[TickType.SOFTIRQ.getIndex()] - prevTicks[TickType.SOFTIRQ.getIndex()];
- long steal = ticks[TickType.STEAL.getIndex()] - prevTicks[TickType.STEAL.getIndex()];
- long cSys = ticks[TickType.SYSTEM.getIndex()] - prevTicks[TickType.SYSTEM.getIndex()];
- long user = ticks[TickType.USER.getIndex()] - prevTicks[TickType.USER.getIndex()];
- long iowait = ticks[TickType.IOWAIT.getIndex()] - prevTicks[TickType.IOWAIT.getIndex()];
- long idle = ticks[TickType.IDLE.getIndex()] - prevTicks[TickType.IDLE.getIndex()];
- long totalCpu = user + nice + cSys + idle + iowait + irq + softirq + steal;
- cpu.setCpuNum(processor.getLogicalProcessorCount());
- cpu.setTotal(totalCpu);
- cpu.setSys(cSys);
- cpu.setUsed(user);
- cpu.setWait(iowait);
- cpu.setFree(idle);
- }
-
- /**
- * 璁剧疆鍐呭瓨淇℃伅
- */
- private void setMemInfo(GlobalMemory memory)
- {
- mem.setTotal(memory.getTotal());
- mem.setUsed(memory.getTotal() - memory.getAvailable());
- mem.setFree(memory.getAvailable());
- }
-
- /**
- * 璁剧疆鏈嶅姟鍣ㄤ俊鎭
- */
- private void setSysInfo()
- {
- Properties props = System.getProperties();
- sys.setComputerName(IpUtils.getHostName());
- sys.setComputerIp(IpUtils.getHostIp());
- sys.setOsName(props.getProperty("os.name"));
- sys.setOsArch(props.getProperty("os.arch"));
- sys.setUserDir(props.getProperty("user.dir"));
- }
-
- /**
- * 璁剧疆Java铏氭嫙鏈
- */
- private void setJvmInfo() throws UnknownHostException
- {
- Properties props = System.getProperties();
- jvm.setTotal(Runtime.getRuntime().totalMemory());
- jvm.setMax(Runtime.getRuntime().maxMemory());
- jvm.setFree(Runtime.getRuntime().freeMemory());
- jvm.setVersion(props.getProperty("java.version"));
- jvm.setHome(props.getProperty("java.home"));
- }
-
- /**
- * 璁剧疆纾佺洏淇℃伅
- */
- private void setSysFiles(OperatingSystem os)
- {
- FileSystem fileSystem = os.getFileSystem();
- OSFileStore[] fsArray = fileSystem.getFileStores();
- for (OSFileStore fs : fsArray)
- {
- long free = fs.getUsableSpace();
- long total = fs.getTotalSpace();
- long used = total - free;
- SysFile sysFile = new SysFile();
- sysFile.setDirName(fs.getMount());
- sysFile.setSysTypeName(fs.getType());
- sysFile.setTypeName(fs.getName());
- sysFile.setTotal(convertFileSize(total));
- sysFile.setFree(convertFileSize(free));
- sysFile.setUsed(convertFileSize(used));
- sysFile.setUsage(Arith.mul(Arith.div(used, total, 4), 100));
- sysFiles.add(sysFile);
- }
- }
-
- /**
- * 瀛楄妭杞崲
- *
- * @param size 瀛楄妭澶у皬
- * @return 杞崲鍚庡
- */
- public String convertFileSize(long size)
- {
- long kb = 1024;
- long mb = kb * 1024;
- long gb = mb * 1024;
- if (size >= gb)
- {
- return String.format("%.1f GB", (float) size / gb);
- }
- else if (size >= mb)
- {
- float f = (float) size / mb;
- return String.format(f > 100 ? "%.0f MB" : "%.1f MB", f);
- }
- else if (size >= kb)
- {
- float f = (float) size / kb;
- return String.format(f > 100 ? "%.0f KB" : "%.1f KB", f);
- }
- else
- {
- return String.format("%d B", size);
- }
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/TreeSelect.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/TreeSelect.java
deleted file mode 100644
index 2ace4e9c..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/TreeSelect.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.ruoyi.framework.web.domain;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.stream.Collectors;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.ruoyi.project.system.domain.SysDept;
-import com.ruoyi.project.system.domain.SysMenu;
-
-/**
- * Treeselect鏍戠粨鏋勫疄浣撶被
- *
- * @author ruoyi
- */
-public class TreeSelect implements Serializable
-{
- private static final long serialVersionUID = 1L;
-
- /** 鑺傜偣ID */
- private Long id;
-
- /** 鑺傜偣鍚嶇О */
- private String label;
-
- /** 瀛愯妭鐐 */
- @JsonInclude(JsonInclude.Include.NON_EMPTY)
- private List children;
-
- public TreeSelect()
- {
-
- }
-
- public TreeSelect(SysDept dept)
- {
- this.id = dept.getDeptId();
- this.label = dept.getDeptName();
- this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
- }
-
- public TreeSelect(SysMenu menu)
- {
- this.id = menu.getMenuId();
- this.label = menu.getMenuName();
- this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
- }
-
- public Long getId()
- {
- return id;
- }
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public String getLabel()
- {
- return label;
- }
-
- public void setLabel(String label)
- {
- this.label = label;
- }
-
- public List getChildren()
- {
- return children;
- }
-
- public void setChildren(List children)
- {
- this.children = children;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java
deleted file mode 100644
index cf7b46e1..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.ruoyi.framework.web.domain.server;
-
-import com.ruoyi.common.utils.Arith;
-
-/**
- * CPU鐩稿叧淇℃伅
- *
- * @author ruoyi
- */
-public class Cpu
-{
- /**
- * 鏍稿績鏁
- */
- private int cpuNum;
-
- /**
- * CPU鎬荤殑浣跨敤鐜
- */
- private double total;
-
- /**
- * CPU绯荤粺浣跨敤鐜
- */
- private double sys;
-
- /**
- * CPU鐢ㄦ埛浣跨敤鐜
- */
- private double used;
-
- /**
- * CPU褰撳墠绛夊緟鐜
- */
- private double wait;
-
- /**
- * CPU褰撳墠绌洪棽鐜
- */
- private double free;
-
- public int getCpuNum()
- {
- return cpuNum;
- }
-
- public void setCpuNum(int cpuNum)
- {
- this.cpuNum = cpuNum;
- }
-
- public double getTotal()
- {
- return Arith.round(Arith.mul(total, 100), 2);
- }
-
- public void setTotal(double total)
- {
- this.total = total;
- }
-
- public double getSys()
- {
- return Arith.round(Arith.mul(sys / total, 100), 2);
- }
-
- public void setSys(double sys)
- {
- this.sys = sys;
- }
-
- public double getUsed()
- {
- return Arith.round(Arith.mul(used / total, 100), 2);
- }
-
- public void setUsed(double used)
- {
- this.used = used;
- }
-
- public double getWait()
- {
- return Arith.round(Arith.mul(wait / total, 100), 2);
- }
-
- public void setWait(double wait)
- {
- this.wait = wait;
- }
-
- public double getFree()
- {
- return Arith.round(Arith.mul(free / total, 100), 2);
- }
-
- public void setFree(double free)
- {
- this.free = free;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java
deleted file mode 100644
index f29d2cbe..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.ruoyi.framework.web.domain.server;
-
-import java.lang.management.ManagementFactory;
-import com.ruoyi.common.utils.Arith;
-import com.ruoyi.common.utils.DateUtils;
-
-/**
- * JVM鐩稿叧淇℃伅
- *
- * @author ruoyi
- */
-public class Jvm
-{
- /**
- * 褰撳墠JVM鍗犵敤鐨勫唴瀛樻绘暟(M)
- */
- private double total;
-
- /**
- * JVM鏈澶у彲鐢ㄥ唴瀛樻绘暟(M)
- */
- private double max;
-
- /**
- * JVM绌洪棽鍐呭瓨(M)
- */
- private double free;
-
- /**
- * JDK鐗堟湰
- */
- private String version;
-
- /**
- * JDK璺緞
- */
- private String home;
-
- public double getTotal()
- {
- return Arith.div(total, (1024 * 1024), 2);
- }
-
- public void setTotal(double total)
- {
- this.total = total;
- }
-
- public double getMax()
- {
- return Arith.div(max, (1024 * 1024), 2);
- }
-
- public void setMax(double max)
- {
- this.max = max;
- }
-
- public double getFree()
- {
- return Arith.div(free, (1024 * 1024), 2);
- }
-
- public void setFree(double free)
- {
- this.free = free;
- }
-
- public double getUsed()
- {
- return Arith.div(total - free, (1024 * 1024), 2);
- }
-
- public double getUsage()
- {
- return Arith.mul(Arith.div(total - free, total, 4), 100);
- }
-
- /**
- * 鑾峰彇JDK鍚嶇О
- */
- public String getName()
- {
- return ManagementFactory.getRuntimeMXBean().getVmName();
- }
-
- public String getVersion()
- {
- return version;
- }
-
- public void setVersion(String version)
- {
- this.version = version;
- }
-
- public String getHome()
- {
- return home;
- }
-
- public void setHome(String home)
- {
- this.home = home;
- }
-
- /**
- * JDK鍚姩鏃堕棿
- */
- public String getStartTime()
- {
- return DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.getServerStartDate());
- }
-
- /**
- * JDK杩愯鏃堕棿
- */
- public String getRunTime()
- {
- return DateUtils.getDatePoor(DateUtils.getNowDate(), DateUtils.getServerStartDate());
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java
deleted file mode 100644
index ac715049..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.ruoyi.framework.web.domain.server;
-
-import com.ruoyi.common.utils.Arith;
-
-/**
- * 鍏у瓨鐩稿叧淇℃伅
- *
- * @author ruoyi
- */
-public class Mem
-{
- /**
- * 鍐呭瓨鎬婚噺
- */
- private double total;
-
- /**
- * 宸茬敤鍐呭瓨
- */
- private double used;
-
- /**
- * 鍓╀綑鍐呭瓨
- */
- private double free;
-
- public double getTotal()
- {
- return Arith.div(total, (1024 * 1024 * 1024), 2);
- }
-
- public void setTotal(long total)
- {
- this.total = total;
- }
-
- public double getUsed()
- {
- return Arith.div(used, (1024 * 1024 * 1024), 2);
- }
-
- public void setUsed(long used)
- {
- this.used = used;
- }
-
- public double getFree()
- {
- return Arith.div(free, (1024 * 1024 * 1024), 2);
- }
-
- public void setFree(long free)
- {
- this.free = free;
- }
-
- public double getUsage()
- {
- return Arith.mul(Arith.div(used, total, 4), 100);
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java
deleted file mode 100644
index a5f65e46..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.ruoyi.framework.web.domain.server;
-
-/**
- * 绯荤粺鐩稿叧淇℃伅
- *
- * @author ruoyi
- */
-public class Sys
-{
- /**
- * 鏈嶅姟鍣ㄥ悕绉
- */
- private String computerName;
-
- /**
- * 鏈嶅姟鍣↖p
- */
- private String computerIp;
-
- /**
- * 椤圭洰璺緞
- */
- private String userDir;
-
- /**
- * 鎿嶄綔绯荤粺
- */
- private String osName;
-
- /**
- * 绯荤粺鏋舵瀯
- */
- private String osArch;
-
- public String getComputerName()
- {
- return computerName;
- }
-
- public void setComputerName(String computerName)
- {
- this.computerName = computerName;
- }
-
- public String getComputerIp()
- {
- return computerIp;
- }
-
- public void setComputerIp(String computerIp)
- {
- this.computerIp = computerIp;
- }
-
- public String getUserDir()
- {
- return userDir;
- }
-
- public void setUserDir(String userDir)
- {
- this.userDir = userDir;
- }
-
- public String getOsName()
- {
- return osName;
- }
-
- public void setOsName(String osName)
- {
- this.osName = osName;
- }
-
- public String getOsArch()
- {
- return osArch;
- }
-
- public void setOsArch(String osArch)
- {
- this.osArch = osArch;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java
deleted file mode 100644
index 47ecf3f3..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.ruoyi.framework.web.domain.server;
-
-/**
- * 绯荤粺鏂囦欢鐩稿叧淇℃伅
- *
- * @author ruoyi
- */
-public class SysFile
-{
- /**
- * 鐩樼璺緞
- */
- private String dirName;
-
- /**
- * 鐩樼绫诲瀷
- */
- private String sysTypeName;
-
- /**
- * 鏂囦欢绫诲瀷
- */
- private String typeName;
-
- /**
- * 鎬诲ぇ灏
- */
- private String total;
-
- /**
- * 鍓╀綑澶у皬
- */
- private String free;
-
- /**
- * 宸茬粡浣跨敤閲
- */
- private String used;
-
- /**
- * 璧勬簮鐨勪娇鐢ㄧ巼
- */
- private double usage;
-
- public String getDirName()
- {
- return dirName;
- }
-
- public void setDirName(String dirName)
- {
- this.dirName = dirName;
- }
-
- public String getSysTypeName()
- {
- return sysTypeName;
- }
-
- public void setSysTypeName(String sysTypeName)
- {
- this.sysTypeName = sysTypeName;
- }
-
- public String getTypeName()
- {
- return typeName;
- }
-
- public void setTypeName(String typeName)
- {
- this.typeName = typeName;
- }
-
- public String getTotal()
- {
- return total;
- }
-
- public void setTotal(String total)
- {
- this.total = total;
- }
-
- public String getFree()
- {
- return free;
- }
-
- public void setFree(String free)
- {
- this.free = free;
- }
-
- public String getUsed()
- {
- return used;
- }
-
- public void setUsed(String used)
- {
- this.used = used;
- }
-
- public double getUsage()
- {
- return usage;
- }
-
- public void setUsage(double usage)
- {
- this.usage = usage;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/ruoyi/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
deleted file mode 100644
index 12b4358d..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.ruoyi.framework.web.exception;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.authentication.AccountExpiredException;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.validation.BindException;
-import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-import org.springframework.web.servlet.NoHandlerFoundException;
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.exception.BaseException;
-import com.ruoyi.common.exception.CustomException;
-import com.ruoyi.common.exception.DemoModeException;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.domain.AjaxResult;
-
-/**
- * 鍏ㄥ眬寮傚父澶勭悊鍣
- *
- * @author ruoyi
- */
-@RestControllerAdvice
-public class GlobalExceptionHandler
-{
- private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class);
-
- /**
- * 鍩虹寮傚父
- */
- @ExceptionHandler(BaseException.class)
- public AjaxResult baseException(BaseException e)
- {
- return AjaxResult.error(e.getMessage());
- }
-
- /**
- * 涓氬姟寮傚父
- */
- @ExceptionHandler(CustomException.class)
- public AjaxResult businessException(CustomException e)
- {
- if (StringUtils.isNull(e.getCode()))
- {
- return AjaxResult.error(e.getMessage());
- }
- return AjaxResult.error(e.getCode(), e.getMessage());
- }
-
- @ExceptionHandler(NoHandlerFoundException.class)
- public AjaxResult handlerNoFoundException(Exception e)
- {
- log.error(e.getMessage(), e);
- return AjaxResult.error(HttpStatus.NOT_FOUND, "璺緞涓嶅瓨鍦紝璇锋鏌ヨ矾寰勬槸鍚︽纭");
- }
-
- @ExceptionHandler(AccessDeniedException.class)
- public AjaxResult handleAuthorizationException(AccessDeniedException e)
- {
- log.error(e.getMessage());
- return AjaxResult.error(HttpStatus.FORBIDDEN, "娌℃湁鏉冮檺锛岃鑱旂郴绠＄悊鍛樻巿鏉");
- }
-
- @ExceptionHandler(AccountExpiredException.class)
- public AjaxResult handleAccountExpiredException(AccountExpiredException e)
- {
- log.error(e.getMessage(), e);
- return AjaxResult.error(e.getMessage());
- }
-
- @ExceptionHandler(UsernameNotFoundException.class)
- public AjaxResult handleUsernameNotFoundException(UsernameNotFoundException e)
- {
- log.error(e.getMessage(), e);
- return AjaxResult.error(e.getMessage());
- }
-
- @ExceptionHandler(Exception.class)
- public AjaxResult handleException(Exception e)
- {
- log.error(e.getMessage(), e);
- return AjaxResult.error(e.getMessage());
- }
-
- /**
- * 鑷畾涔夐獙璇佸紓甯
- */
- @ExceptionHandler(BindException.class)
- public AjaxResult validatedBindException(BindException e)
- {
- log.error(e.getMessage(), e);
- String message = e.getAllErrors().get(0).getDefaultMessage();
- return AjaxResult.error(message);
- }
-
- /**
- * 鑷畾涔夐獙璇佸紓甯
- */
- @ExceptionHandler(MethodArgumentNotValidException.class)
- public Object validExceptionHandler(MethodArgumentNotValidException e)
- {
- log.error(e.getMessage(), e);
- String message = e.getBindingResult().getFieldError().getDefaultMessage();
- return AjaxResult.error(message);
- }
-
- /**
- * 婕旂ず妯″紡寮傚父
- */
- @ExceptionHandler(DemoModeException.class)
- public AjaxResult demoModeException(DemoModeException e)
- {
- return AjaxResult.error("婕旂ず妯″紡锛屼笉鍏佽鎿嶄綔");
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/web/page/PageDomain.java b/ruoyi/src/main/java/com/ruoyi/framework/web/page/PageDomain.java
deleted file mode 100644
index 7e50472d..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/web/page/PageDomain.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.ruoyi.framework.web.page;
-
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * 鍒嗛〉鏁版嵁
- *
- * @author ruoyi
- */
-public class PageDomain
-{
- /** 褰撳墠璁板綍璧峰绱㈠紩 */
- private Integer pageNum;
- /** 姣忛〉鏄剧ず璁板綍鏁 */
- private Integer pageSize;
- /** 鎺掑簭鍒 */
- private String orderByColumn;
- /** 鎺掑簭鐨勬柟鍚 "desc" 鎴栬 "asc". */
- private String isAsc;
-
- public String getOrderBy()
- {
- if (StringUtils.isEmpty(orderByColumn))
- {
- return "";
- }
- return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc;
- }
-
- public Integer getPageNum()
- {
- return pageNum;
- }
-
- public void setPageNum(Integer pageNum)
- {
- this.pageNum = pageNum;
- }
-
- public Integer getPageSize()
- {
- return pageSize;
- }
-
- public void setPageSize(Integer pageSize)
- {
- this.pageSize = pageSize;
- }
-
- public String getOrderByColumn()
- {
- return orderByColumn;
- }
-
- public void setOrderByColumn(String orderByColumn)
- {
- this.orderByColumn = orderByColumn;
- }
-
- public String getIsAsc()
- {
- return isAsc;
- }
-
- public void setIsAsc(String isAsc)
- {
- this.isAsc = isAsc;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java b/ruoyi/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java
deleted file mode 100644
index 3a184c68..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.ruoyi.framework.web.page;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 琛ㄦ牸鍒嗛〉鏁版嵁瀵硅薄
- *
- * @author ruoyi
- */
-public class TableDataInfo implements Serializable
-{
- private static final long serialVersionUID = 1L;
-
- /** 鎬昏褰曟暟 */
- private long total;
-
- /** 鍒楄〃鏁版嵁 */
- private List rows;
-
- /** 娑堟伅鐘舵佺爜 */
- private int code;
-
- /** 娑堟伅鍐呭 */
- private int msg;
-
- /**
- * 琛ㄦ牸鏁版嵁瀵硅薄
- */
- public TableDataInfo()
- {
- }
-
- /**
- * 鍒嗛〉
- *
- * @param list 鍒楄〃鏁版嵁
- * @param total 鎬昏褰曟暟
- */
- public TableDataInfo(List list, int total)
- {
- this.rows = list;
- this.total = total;
- }
-
- public long getTotal()
- {
- return total;
- }
-
- public void setTotal(long total)
- {
- this.total = total;
- }
-
- public List getRows()
- {
- return rows;
- }
-
- public void setRows(List rows)
- {
- this.rows = rows;
- }
-
- public int getCode()
- {
- return code;
- }
-
- public void setCode(int code)
- {
- this.code = code;
- }
-
- public int getMsg()
- {
- return msg;
- }
-
- public void setMsg(int msg)
- {
- this.msg = msg;
- }
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/web/page/TableSupport.java b/ruoyi/src/main/java/com/ruoyi/framework/web/page/TableSupport.java
deleted file mode 100644
index fa6a9ee3..00000000
--- a/ruoyi/src/main/java/com/ruoyi/framework/web/page/TableSupport.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.ruoyi.framework.web.page;
-
-import com.ruoyi.common.utils.ServletUtils;
-
-/**
- * 琛ㄦ牸鏁版嵁澶勭悊
- *
- * @author ruoyi
- */
-public class TableSupport
-{
- /**
- * 褰撳墠璁板綍璧峰绱㈠紩
- */
- public static final String PAGE_NUM = "pageNum";
-
- /**
- * 姣忛〉鏄剧ず璁板綍鏁
- */
- public static final String PAGE_SIZE = "pageSize";
-
- /**
- * 鎺掑簭鍒
- */
- public static final String ORDER_BY_COLUMN = "orderByColumn";
-
- /**
- * 鎺掑簭鐨勬柟鍚 "desc" 鎴栬 "asc".
- */
- public static final String IS_ASC = "isAsc";
-
- /**
- * 灏佽鍒嗛〉瀵硅薄
- */
- public static PageDomain getPageDomain()
- {
- PageDomain pageDomain = new PageDomain();
- pageDomain.setPageNum(ServletUtils.getParameterToInt(PAGE_NUM));
- pageDomain.setPageSize(ServletUtils.getParameterToInt(PAGE_SIZE));
- pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN));
- pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC));
- return pageDomain;
- }
-
- public static PageDomain buildPageRequest()
- {
- return getPageDomain();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/common/CaptchaController.java b/ruoyi/src/main/java/com/ruoyi/project/common/CaptchaController.java
deleted file mode 100644
index 9a3af208..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/common/CaptchaController.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.ruoyi.project.common;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.utils.IdUtils;
-import com.ruoyi.common.utils.VerifyCodeUtils;
-import com.ruoyi.common.utils.sign.Base64;
-import com.ruoyi.framework.redis.RedisCache;
-import com.ruoyi.framework.web.domain.AjaxResult;
-
-/**
- * 楠岃瘉鐮佹搷浣滃鐞
- *
- * @author ruoyi
- */
-@RestController
-public class CaptchaController
-{
- @Autowired
- private RedisCache redisCache;
-
- /**
- * 鐢熸垚楠岃瘉鐮
- */
- @GetMapping("/captchaImage")
- public AjaxResult getCode(HttpServletResponse response) throws IOException
- {
- // 鐢熸垚闅忔満瀛椾覆
- String verifyCode = VerifyCodeUtils.generateVerifyCode(4);
- // 鍞竴鏍囪瘑
- String uuid = IdUtils.simpleUUID();
- String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
-
- redisCache.setCacheObject(verifyKey, verifyCode, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
- // 鐢熸垚鍥剧墖
- int w = 111, h = 36;
- ByteArrayOutputStream stream = new ByteArrayOutputStream();
- VerifyCodeUtils.outputImage(w, h, stream, verifyCode);
- try
- {
- AjaxResult ajax = AjaxResult.success();
- ajax.put("uuid", uuid);
- ajax.put("img", Base64.encode(stream.toByteArray()));
- return ajax;
- }
- catch (Exception e)
- {
- e.printStackTrace();
- return AjaxResult.error(e.getMessage());
- }
- finally
- {
- stream.close();
- }
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/common/CommonController.java b/ruoyi/src/main/java/com/ruoyi/project/common/CommonController.java
deleted file mode 100644
index 3bb81d0d..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/common/CommonController.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.ruoyi.project.common;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.common.utils.file.FileUtils;
-import com.ruoyi.framework.config.RuoYiConfig;
-import com.ruoyi.framework.config.ServerConfig;
-import com.ruoyi.framework.web.domain.AjaxResult;
-
-/**
- * 閫氱敤璇锋眰澶勭悊
- *
- * @author ruoyi
- */
-@RestController
-public class CommonController
-{
- private static final Logger log = LoggerFactory.getLogger(CommonController.class);
-
- @Autowired
- private ServerConfig serverConfig;
-
- /**
- * 閫氱敤涓嬭浇璇锋眰
- *
- * @param fileName 鏂囦欢鍚嶇О
- * @param delete 鏄惁鍒犻櫎
- */
- @GetMapping("common/download")
- public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
- {
- try
- {
- if (!FileUtils.isValidFilename(fileName))
- {
- throw new Exception(StringUtils.format("鏂囦欢鍚嶇О({})闈炴硶锛屼笉鍏佽涓嬭浇銆 ", fileName));
- }
- String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
- String filePath = RuoYiConfig.getDownloadPath() + fileName;
-
- response.setCharacterEncoding("utf-8");
- response.setContentType("multipart/form-data");
- response.setHeader("Content-Disposition",
- "attachment;fileName=" + FileUtils.setFileDownloadHeader(request, realFileName));
- FileUtils.writeBytes(filePath, response.getOutputStream());
- if (delete)
- {
- FileUtils.deleteFile(filePath);
- }
- }
- catch (Exception e)
- {
- log.error("涓嬭浇鏂囦欢澶辫触", e);
- }
- }
-
- /**
- * 閫氱敤涓婁紶璇锋眰
- */
- @PostMapping("/common/upload")
- public AjaxResult uploadFile(MultipartFile file) throws Exception
- {
- try
- {
- // 涓婁紶鏂囦欢璺緞
- String filePath = RuoYiConfig.getUploadPath();
- // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
- String fileName = FileUploadUtils.upload(filePath, file);
- String url = serverConfig.getUrl() + fileName;
- AjaxResult ajax = AjaxResult.success();
- ajax.put("fileName", fileName);
- ajax.put("url", url);
- return ajax;
- }
- catch (Exception e)
- {
- return AjaxResult.error(e.getMessage());
- }
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/ServerController.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/ServerController.java
deleted file mode 100644
index a6922261..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/ServerController.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.ruoyi.project.monitor.controller;
-
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.domain.Server;
-
-/**
- * 鏈嶅姟鍣ㄧ洃鎺
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/monitor/server")
-public class ServerController extends BaseController
-{
- @PreAuthorize("@ss.hasPermi('monitor:server:list')")
- @GetMapping()
- public AjaxResult getInfo() throws Exception
- {
- Server server = new Server();
- server.copyTo();
- return AjaxResult.success(server);
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java
deleted file mode 100644
index ecda0764..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.ruoyi.project.monitor.controller;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.monitor.domain.SysLogininfor;
-import com.ruoyi.project.monitor.service.ISysLogininforService;
-
-/**
- * 绯荤粺璁块棶璁板綍
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/monitor/logininfor")
-public class SysLogininforController extends BaseController
-{
- @Autowired
- private ISysLogininforService logininforService;
-
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysLogininfor logininfor)
- {
- startPage();
- List list = logininforService.selectLogininforList(logininfor);
- return getDataTable(list);
- }
-
- @Log(title = "鐧婚檰鏃ュ織", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
- @GetMapping("/export")
- public AjaxResult export(SysLogininfor logininfor)
- {
- List list = logininforService.selectLogininforList(logininfor);
- ExcelUtil util = new ExcelUtil(SysLogininfor.class);
- return util.exportExcel(list, "鐧婚檰鏃ュ織");
- }
-
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
- @Log(title = "鐧婚檰鏃ュ織", businessType = BusinessType.DELETE)
- @DeleteMapping("/{infoIds}")
- public AjaxResult remove(@PathVariable Long[] infoIds)
- {
- return toAjax(logininforService.deleteLogininforByIds(infoIds));
- }
-
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
- @Log(title = "鐧婚檰鏃ュ織", businessType = BusinessType.CLEAN)
- @DeleteMapping("/clean")
- public AjaxResult clean()
- {
- logininforService.cleanLogininfor();
- return AjaxResult.success();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java
deleted file mode 100644
index d0d5c340..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.ruoyi.project.monitor.controller;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.monitor.domain.SysOperLog;
-import com.ruoyi.project.monitor.service.ISysOperLogService;
-
-/**
- * 鎿嶄綔鏃ュ織璁板綍
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/monitor/operlog")
-public class SysOperlogController extends BaseController
-{
- @Autowired
- private ISysOperLogService operLogService;
-
- @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysOperLog operLog)
- {
- startPage();
- List list = operLogService.selectOperLogList(operLog);
- return getDataTable(list);
- }
-
- @Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
- @GetMapping("/export")
- public AjaxResult export(SysOperLog operLog)
- {
- List list = operLogService.selectOperLogList(operLog);
- ExcelUtil util = new ExcelUtil(SysOperLog.class);
- return util.exportExcel(list, "鎿嶄綔鏃ュ織");
- }
-
- @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
- @DeleteMapping("/{operIds}")
- public AjaxResult remove(@PathVariable Long[] operIds)
- {
- return toAjax(operLogService.deleteOperLogByIds(operIds));
- }
-
- @Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.CLEAN)
- @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
- @DeleteMapping("/clean")
- public AjaxResult clean()
- {
- operLogService.cleanOperLog();
- return AjaxResult.success();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java
deleted file mode 100644
index 5a730191..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.ruoyi.project.monitor.controller;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.redis.RedisCache;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.monitor.domain.SysUserOnline;
-import com.ruoyi.project.system.service.ISysUserOnlineService;
-
-/**
- * 鍦ㄧ嚎鐢ㄦ埛鐩戞帶
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/monitor/online")
-public class SysUserOnlineController extends BaseController
-{
- @Autowired
- private ISysUserOnlineService userOnlineService;
-
- @Autowired
- private RedisCache redisCache;
-
- @PreAuthorize("@ss.hasPermi('monitor:online:list')")
- @GetMapping("/list")
- public TableDataInfo list(String ipaddr, String userName)
- {
- Collection keys = redisCache.keys(Constants.LOGIN_TOKEN_KEY + "*");
- List userOnlineList = new ArrayList();
- for (String key : keys)
- {
- LoginUser user = redisCache.getCacheObject(key);
- if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
- {
- if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
- {
- userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
- }
- }
- else if (StringUtils.isNotEmpty(ipaddr))
- {
- if (StringUtils.equals(ipaddr, user.getIpaddr()))
- {
- userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
- }
- }
- else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
- {
- if (StringUtils.equals(userName, user.getUsername()))
- {
- userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
- }
- }
- else
- {
- userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
- }
- }
- Collections.reverse(userOnlineList);
- userOnlineList.removeAll(Collections.singleton(null));
- return getDataTable(userOnlineList);
- }
-
- /**
- * 寮洪鐢ㄦ埛
- */
- @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
- @Log(title = "鍦ㄧ嚎鐢ㄦ埛", businessType = BusinessType.DELETE)
- @DeleteMapping("/{tokenId}")
- public AjaxResult forceLogout(@PathVariable String tokenId)
- {
- redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
- return AjaxResult.success();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
deleted file mode 100644
index 7519058e..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.ruoyi.project.monitor.domain;
-
-import java.util.Date;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.ruoyi.framework.web.domain.BaseEntity;
-
-/**
- * 绯荤粺璁块棶璁板綍琛 sys_logininfor
- *
- * @author ruoyi
- */
-public class SysLogininfor extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** ID */
- @Excel(name = "搴忓彿", cellType = ColumnType.NUMERIC)
- private Long infoId;
-
- /** 鐢ㄦ埛璐﹀彿 */
- @Excel(name = "鐢ㄦ埛璐﹀彿")
- private String userName;
-
- /** 鐧诲綍鐘舵 0鎴愬姛 1澶辫触 */
- @Excel(name = "鐧诲綍鐘舵", readConverterExp = "0=鎴愬姛,1=澶辫触")
- private String status;
-
- /** 鐧诲綍IP鍦板潃 */
- @Excel(name = "鐧诲綍鍦板潃")
- private String ipaddr;
-
- /** 鐧诲綍鍦扮偣 */
- @Excel(name = "鐧诲綍鍦扮偣")
- private String loginLocation;
-
- /** 娴忚鍣ㄧ被鍨 */
- @Excel(name = "娴忚鍣")
- private String browser;
-
- /** 鎿嶄綔绯荤粺 */
- @Excel(name = "鎿嶄綔绯荤粺")
- private String os;
-
- /** 鎻愮ず娑堟伅 */
- @Excel(name = "鎻愮ず娑堟伅")
- private String msg;
-
- /** 璁块棶鏃堕棿 */
- @Excel(name = "璁块棶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date loginTime;
-
- public Long getInfoId()
- {
- return infoId;
- }
-
- public void setInfoId(Long infoId)
- {
- this.infoId = infoId;
- }
-
- public String getUserName()
- {
- return userName;
- }
-
- public void setUserName(String userName)
- {
- this.userName = userName;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- public String getIpaddr()
- {
- return ipaddr;
- }
-
- public void setIpaddr(String ipaddr)
- {
- this.ipaddr = ipaddr;
- }
-
- public String getLoginLocation()
- {
- return loginLocation;
- }
-
- public void setLoginLocation(String loginLocation)
- {
- this.loginLocation = loginLocation;
- }
-
- public String getBrowser()
- {
- return browser;
- }
-
- public void setBrowser(String browser)
- {
- this.browser = browser;
- }
-
- public String getOs()
- {
- return os;
- }
-
- public void setOs(String os)
- {
- this.os = os;
- }
-
- public String getMsg()
- {
- return msg;
- }
-
- public void setMsg(String msg)
- {
- this.msg = msg;
- }
-
- public Date getLoginTime()
- {
- return loginTime;
- }
-
- public void setLoginTime(Date loginTime)
- {
- this.loginTime = loginTime;
- }
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java
deleted file mode 100644
index 813100cb..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java
+++ /dev/null
@@ -1,253 +0,0 @@
-package com.ruoyi.project.monitor.domain;
-
-import java.util.Date;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.ruoyi.framework.web.domain.BaseEntity;
-
-/**
- * 鎿嶄綔鏃ュ織璁板綍琛 oper_log
- *
- * @author ruoyi
- */
-public class SysOperLog extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 鏃ュ織涓婚敭 */
- @Excel(name = "鎿嶄綔搴忓彿", cellType = ColumnType.NUMERIC)
- private Long operId;
-
- /** 鎿嶄綔妯″潡 */
- @Excel(name = "鎿嶄綔妯″潡")
- private String title;
-
- /** 涓氬姟绫诲瀷锛0鍏跺畠 1鏂板 2淇敼 3鍒犻櫎锛 */
- @Excel(name = "涓氬姟绫诲瀷", readConverterExp = "0=鍏跺畠,1=鏂板,2=淇敼,3=鍒犻櫎,4=鎺堟潈,5=瀵煎嚭,6=瀵煎叆,7=寮洪,8=鐢熸垚浠ｇ爜,9=娓呯┖鏁版嵁")
- private Integer businessType;
-
- /** 涓氬姟绫诲瀷鏁扮粍 */
- private Integer[] businessTypes;
-
- /** 璇锋眰鏂规硶 */
- @Excel(name = "璇锋眰鏂规硶")
- private String method;
-
- /** 璇锋眰鏂瑰紡 */
- @Excel(name = "璇锋眰鏂瑰紡")
- private String requestMethod;
-
- /** 鎿嶄綔绫诲埆锛0鍏跺畠 1鍚庡彴鐢ㄦ埛 2鎵嬫満绔敤鎴凤級 */
- @Excel(name = "鎿嶄綔绫诲埆", readConverterExp = "0=鍏跺畠,1=鍚庡彴鐢ㄦ埛,2=鎵嬫満绔敤鎴")
- private Integer operatorType;
-
- /** 鎿嶄綔浜哄憳 */
- @Excel(name = "鎿嶄綔浜哄憳")
- private String operName;
-
- /** 閮ㄩ棬鍚嶇О */
- @Excel(name = "閮ㄩ棬鍚嶇О")
- private String deptName;
-
- /** 璇锋眰url */
- @Excel(name = "璇锋眰鍦板潃")
- private String operUrl;
-
- /** 鎿嶄綔鍦板潃 */
- @Excel(name = "鎿嶄綔鍦板潃")
- private String operIp;
-
- /** 鎿嶄綔鍦扮偣 */
- @Excel(name = "鎿嶄綔鍦扮偣")
- private String operLocation;
-
- /** 璇锋眰鍙傛暟 */
- @Excel(name = "璇锋眰鍙傛暟")
- private String operParam;
-
- /** 杩斿洖鍙傛暟 */
- @Excel(name = "杩斿洖鍙傛暟")
- private String jsonResult;
-
- /** 鎿嶄綔鐘舵侊紙0姝ｅ父 1寮傚父锛 */
- @Excel(name = "鐘舵", readConverterExp = "0=姝ｅ父,1=寮傚父")
- private Integer status;
-
- /** 閿欒娑堟伅 */
- @Excel(name = "閿欒娑堟伅")
- private String errorMsg;
-
- /** 鎿嶄綔鏃堕棿 */
- @Excel(name = "鎿嶄綔鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date operTime;
-
- public Long getOperId()
- {
- return operId;
- }
-
- public void setOperId(Long operId)
- {
- this.operId = operId;
- }
-
- public String getTitle()
- {
- return title;
- }
-
- public void setTitle(String title)
- {
- this.title = title;
- }
-
- public Integer getBusinessType()
- {
- return businessType;
- }
-
- public void setBusinessType(Integer businessType)
- {
- this.businessType = businessType;
- }
-
- public Integer[] getBusinessTypes()
- {
- return businessTypes;
- }
-
- public void setBusinessTypes(Integer[] businessTypes)
- {
- this.businessTypes = businessTypes;
- }
-
- public String getMethod()
- {
- return method;
- }
-
- public void setMethod(String method)
- {
- this.method = method;
- }
-
- public String getRequestMethod()
- {
- return requestMethod;
- }
-
- public void setRequestMethod(String requestMethod)
- {
- this.requestMethod = requestMethod;
- }
-
- public Integer getOperatorType()
- {
- return operatorType;
- }
-
- public void setOperatorType(Integer operatorType)
- {
- this.operatorType = operatorType;
- }
-
- public String getOperName()
- {
- return operName;
- }
-
- public void setOperName(String operName)
- {
- this.operName = operName;
- }
-
- public String getDeptName()
- {
- return deptName;
- }
-
- public void setDeptName(String deptName)
- {
- this.deptName = deptName;
- }
-
- public String getOperUrl()
- {
- return operUrl;
- }
-
- public void setOperUrl(String operUrl)
- {
- this.operUrl = operUrl;
- }
-
- public String getOperIp()
- {
- return operIp;
- }
-
- public void setOperIp(String operIp)
- {
- this.operIp = operIp;
- }
-
- public String getOperLocation()
- {
- return operLocation;
- }
-
- public void setOperLocation(String operLocation)
- {
- this.operLocation = operLocation;
- }
-
- public String getOperParam()
- {
- return operParam;
- }
-
- public void setOperParam(String operParam)
- {
- this.operParam = operParam;
- }
-
- public String getJsonResult()
- {
- return jsonResult;
- }
-
- public void setJsonResult(String jsonResult)
- {
- this.jsonResult = jsonResult;
- }
-
- public Integer getStatus()
- {
- return status;
- }
-
- public void setStatus(Integer status)
- {
- this.status = status;
- }
-
- public String getErrorMsg()
- {
- return errorMsg;
- }
-
- public void setErrorMsg(String errorMsg)
- {
- this.errorMsg = errorMsg;
- }
-
- public Date getOperTime()
- {
- return operTime;
- }
-
- public void setOperTime(Date operTime)
- {
- this.operTime = operTime;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysUserOnline.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysUserOnline.java
deleted file mode 100644
index 843148b4..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysUserOnline.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package com.ruoyi.project.monitor.domain;
-
-/**
- * 褰撳墠鍦ㄧ嚎浼氳瘽
- *
- * @author ruoyi
- */
-public class SysUserOnline
-{
- /** 浼氳瘽缂栧彿 */
- private String tokenId;
-
- /** 閮ㄩ棬鍚嶇О */
- private String deptName;
-
- /** 鐢ㄦ埛鍚嶇О */
- private String userName;
-
- /** 鐧诲綍IP鍦板潃 */
- private String ipaddr;
-
- /** 鐧诲綍鍦板潃 */
- private String loginLocation;
-
- /** 娴忚鍣ㄧ被鍨 */
- private String browser;
-
- /** 鎿嶄綔绯荤粺 */
- private String os;
-
- /** 鐧诲綍鏃堕棿 */
- private Long loginTime;
-
- public String getTokenId()
- {
- return tokenId;
- }
-
- public void setTokenId(String tokenId)
- {
- this.tokenId = tokenId;
- }
-
- public String getDeptName()
- {
- return deptName;
- }
-
- public void setDeptName(String deptName)
- {
- this.deptName = deptName;
- }
-
- public String getUserName()
- {
- return userName;
- }
-
- public void setUserName(String userName)
- {
- this.userName = userName;
- }
-
- public String getIpaddr()
- {
- return ipaddr;
- }
-
- public void setIpaddr(String ipaddr)
- {
- this.ipaddr = ipaddr;
- }
-
- public String getLoginLocation()
- {
- return loginLocation;
- }
-
- public void setLoginLocation(String loginLocation)
- {
- this.loginLocation = loginLocation;
- }
-
- public String getBrowser()
- {
- return browser;
- }
-
- public void setBrowser(String browser)
- {
- this.browser = browser;
- }
-
- public String getOs()
- {
- return os;
- }
-
- public void setOs(String os)
- {
- this.os = os;
- }
-
- public Long getLoginTime()
- {
- return loginTime;
- }
-
- public void setLoginTime(Long loginTime)
- {
- this.loginTime = loginTime;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysLogininforMapper.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysLogininforMapper.java
deleted file mode 100644
index 707fed1f..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysLogininforMapper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.ruoyi.project.monitor.mapper;
-
-import java.util.List;
-import com.ruoyi.project.monitor.domain.SysLogininfor;
-
-/**
- * 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏁版嵁灞
- *
- * @author ruoyi
- */
-public interface SysLogininforMapper
-{
- /**
- * 鏂板绯荤粺鐧诲綍鏃ュ織
- *
- * @param logininfor 璁块棶鏃ュ織瀵硅薄
- */
- public void insertLogininfor(SysLogininfor logininfor);
-
- /**
- * 鏌ヨ绯荤粺鐧诲綍鏃ュ織闆嗗悎
- *
- * @param logininfor 璁块棶鏃ュ織瀵硅薄
- * @return 鐧诲綍璁板綍闆嗗悎
- */
- public List selectLogininforList(SysLogininfor logininfor);
-
- /**
- * 鎵归噺鍒犻櫎绯荤粺鐧诲綍鏃ュ織
- *
- * @param infoIds 闇瑕佸垹闄ょ殑鐧诲綍鏃ュ織ID
- * @return 缁撴灉
- */
- public int deleteLogininforByIds(Long[] infoIds);
-
- /**
- * 娓呯┖绯荤粺鐧诲綍鏃ュ織
- *
- * @return 缁撴灉
- */
- public int cleanLogininfor();
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysOperLogMapper.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysOperLogMapper.java
deleted file mode 100644
index 25b1904a..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysOperLogMapper.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.ruoyi.project.monitor.mapper;
-
-import java.util.List;
-import com.ruoyi.project.monitor.domain.SysOperLog;
-
-/**
- * 鎿嶄綔鏃ュ織 鏁版嵁灞
- *
- * @author ruoyi
- */
-public interface SysOperLogMapper
-{
- /**
- * 鏂板鎿嶄綔鏃ュ織
- *
- * @param operLog 鎿嶄綔鏃ュ織瀵硅薄
- */
- public void insertOperlog(SysOperLog operLog);
-
- /**
- * 鏌ヨ绯荤粺鎿嶄綔鏃ュ織闆嗗悎
- *
- * @param operLog 鎿嶄綔鏃ュ織瀵硅薄
- * @return 鎿嶄綔鏃ュ織闆嗗悎
- */
- public List selectOperLogList(SysOperLog operLog);
-
- /**
- * 鎵归噺鍒犻櫎绯荤粺鎿嶄綔鏃ュ織
- *
- * @param operIds 闇瑕佸垹闄ょ殑鎿嶄綔鏃ュ織ID
- * @return 缁撴灉
- */
- public int deleteOperLogByIds(Long[] operIds);
-
- /**
- * 鏌ヨ鎿嶄綔鏃ュ織璇︾粏
- *
- * @param operId 鎿嶄綔ID
- * @return 鎿嶄綔鏃ュ織瀵硅薄
- */
- public SysOperLog selectOperLogById(Long operId);
-
- /**
- * 娓呯┖鎿嶄綔鏃ュ織
- */
- public void cleanOperLog();
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysLogininforService.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysLogininforService.java
deleted file mode 100644
index f46dddfa..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysLogininforService.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.ruoyi.project.monitor.service;
-
-import java.util.List;
-import com.ruoyi.project.monitor.domain.SysLogininfor;
-
-/**
- * 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏈嶅姟灞
- *
- * @author ruoyi
- */
-public interface ISysLogininforService
-{
- /**
- * 鏂板绯荤粺鐧诲綍鏃ュ織
- *
- * @param logininfor 璁块棶鏃ュ織瀵硅薄
- */
- public void insertLogininfor(SysLogininfor logininfor);
-
- /**
- * 鏌ヨ绯荤粺鐧诲綍鏃ュ織闆嗗悎
- *
- * @param logininfor 璁块棶鏃ュ織瀵硅薄
- * @return 鐧诲綍璁板綍闆嗗悎
- */
- public List selectLogininforList(SysLogininfor logininfor);
-
- /**
- * 鎵归噺鍒犻櫎绯荤粺鐧诲綍鏃ュ織
- *
- * @param infoIds 闇瑕佸垹闄ょ殑鐧诲綍鏃ュ織ID
- * @return
- */
- public int deleteLogininforByIds(Long[] infoIds);
-
- /**
- * 娓呯┖绯荤粺鐧诲綍鏃ュ織
- */
- public void cleanLogininfor();
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysOperLogService.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysOperLogService.java
deleted file mode 100644
index 3e062acd..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysOperLogService.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.ruoyi.project.monitor.service;
-
-import java.util.List;
-import com.ruoyi.project.monitor.domain.SysOperLog;
-
-/**
- * 鎿嶄綔鏃ュ織 鏈嶅姟灞
- *
- * @author ruoyi
- */
-public interface ISysOperLogService
-{
- /**
- * 鏂板鎿嶄綔鏃ュ織
- *
- * @param operLog 鎿嶄綔鏃ュ織瀵硅薄
- */
- public void insertOperlog(SysOperLog operLog);
-
- /**
- * 鏌ヨ绯荤粺鎿嶄綔鏃ュ織闆嗗悎
- *
- * @param operLog 鎿嶄綔鏃ュ織瀵硅薄
- * @return 鎿嶄綔鏃ュ織闆嗗悎
- */
- public List selectOperLogList(SysOperLog operLog);
-
- /**
- * 鎵归噺鍒犻櫎绯荤粺鎿嶄綔鏃ュ織
- *
- * @param operIds 闇瑕佸垹闄ょ殑鎿嶄綔鏃ュ織ID
- * @return 缁撴灉
- */
- public int deleteOperLogByIds(Long[] operIds);
-
- /**
- * 鏌ヨ鎿嶄綔鏃ュ織璇︾粏
- *
- * @param operId 鎿嶄綔ID
- * @return 鎿嶄綔鏃ュ織瀵硅薄
- */
- public SysOperLog selectOperLogById(Long operId);
-
- /**
- * 娓呯┖鎿嶄綔鏃ュ織
- */
- public void cleanOperLog();
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java
deleted file mode 100644
index 5195bb3f..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.ruoyi.project.monitor.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.project.monitor.domain.SysLogininfor;
-import com.ruoyi.project.monitor.mapper.SysLogininforMapper;
-import com.ruoyi.project.monitor.service.ISysLogininforService;
-
-/**
- * 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏈嶅姟灞傚鐞
- *
- * @author ruoyi
- */
-@Service
-public class SysLogininforServiceImpl implements ISysLogininforService
-{
-
- @Autowired
- private SysLogininforMapper logininforMapper;
-
- /**
- * 鏂板绯荤粺鐧诲綍鏃ュ織
- *
- * @param logininfor 璁块棶鏃ュ織瀵硅薄
- */
- @Override
- public void insertLogininfor(SysLogininfor logininfor)
- {
- logininforMapper.insertLogininfor(logininfor);
- }
-
- /**
- * 鏌ヨ绯荤粺鐧诲綍鏃ュ織闆嗗悎
- *
- * @param logininfor 璁块棶鏃ュ織瀵硅薄
- * @return 鐧诲綍璁板綍闆嗗悎
- */
- @Override
- public List selectLogininforList(SysLogininfor logininfor)
- {
- return logininforMapper.selectLogininforList(logininfor);
- }
-
- /**
- * 鎵归噺鍒犻櫎绯荤粺鐧诲綍鏃ュ織
- *
- * @param infoIds 闇瑕佸垹闄ょ殑鐧诲綍鏃ュ織ID
- * @return
- */
- @Override
- public int deleteLogininforByIds(Long[] infoIds)
- {
- return logininforMapper.deleteLogininforByIds(infoIds);
- }
-
- /**
- * 娓呯┖绯荤粺鐧诲綍鏃ュ織
- */
- @Override
- public void cleanLogininfor()
- {
- logininforMapper.cleanLogininfor();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java
deleted file mode 100644
index 65193dd8..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.ruoyi.project.monitor.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.project.monitor.domain.SysOperLog;
-import com.ruoyi.project.monitor.mapper.SysOperLogMapper;
-import com.ruoyi.project.monitor.service.ISysOperLogService;
-
-/**
- * 鎿嶄綔鏃ュ織 鏈嶅姟灞傚鐞
- *
- * @author ruoyi
- */
-@Service
-public class SysOperLogServiceImpl implements ISysOperLogService
-{
- @Autowired
- private SysOperLogMapper operLogMapper;
-
- /**
- * 鏂板鎿嶄綔鏃ュ織
- *
- * @param operLog 鎿嶄綔鏃ュ織瀵硅薄
- */
- @Override
- public void insertOperlog(SysOperLog operLog)
- {
- operLogMapper.insertOperlog(operLog);
- }
-
- /**
- * 鏌ヨ绯荤粺鎿嶄綔鏃ュ織闆嗗悎
- *
- * @param operLog 鎿嶄綔鏃ュ織瀵硅薄
- * @return 鎿嶄綔鏃ュ織闆嗗悎
- */
- @Override
- public List selectOperLogList(SysOperLog operLog)
- {
- return operLogMapper.selectOperLogList(operLog);
- }
-
- /**
- * 鎵归噺鍒犻櫎绯荤粺鎿嶄綔鏃ュ織
- *
- * @param operIds 闇瑕佸垹闄ょ殑鎿嶄綔鏃ュ織ID
- * @return 缁撴灉
- */
- public int deleteOperLogByIds(Long[] operIds)
- {
- return operLogMapper.deleteOperLogByIds(operIds);
- }
-
- /**
- * 鏌ヨ鎿嶄綔鏃ュ織璇︾粏
- *
- * @param operId 鎿嶄綔ID
- * @return 鎿嶄綔鏃ュ織瀵硅薄
- */
- @Override
- public SysOperLog selectOperLogById(Long operId)
- {
- return operLogMapper.selectOperLogById(operId);
- }
-
- /**
- * 娓呯┖鎿嶄綔鏃ュ織
- */
- @Override
- public void cleanOperLog()
- {
- operLogMapper.cleanOperLog();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
deleted file mode 100644
index 1d59084d..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.ruoyi.project.system.controller;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.domain.SysConfig;
-import com.ruoyi.project.system.service.ISysConfigService;
-
-/**
- * 鍙傛暟閰嶇疆 淇℃伅鎿嶄綔澶勭悊
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/system/config")
-public class SysConfigController extends BaseController
-{
- @Autowired
- private ISysConfigService configService;
-
- /**
- * 鑾峰彇鍙傛暟閰嶇疆鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('system:config:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysConfig config)
- {
- startPage();
- List list = configService.selectConfigList(config);
- return getDataTable(list);
- }
-
- @Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:config:export')")
- @GetMapping("/export")
- public AjaxResult export(SysConfig config)
- {
- List list = configService.selectConfigList(config);
- ExcelUtil util = new ExcelUtil(SysConfig.class);
- return util.exportExcel(list, "鍙傛暟鏁版嵁");
- }
-
- /**
- * 鏍规嵁鍙傛暟缂栧彿鑾峰彇璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('system:config:query')")
- @GetMapping(value = "/{configId}")
- public AjaxResult getInfo(@PathVariable Long configId)
- {
- return AjaxResult.success(configService.selectConfigById(configId));
- }
-
- /**
- * 鏍规嵁鍙傛暟閿悕鏌ヨ鍙傛暟鍊
- */
- @GetMapping(value = "/configKey/{configKey}")
- public AjaxResult getConfigKey(@PathVariable String configKey)
- {
- return AjaxResult.success(configService.selectConfigByKey(configKey));
- }
-
- /**
- * 鏂板鍙傛暟閰嶇疆
- */
- @PreAuthorize("@ss.hasPermi('system:config:add')")
- @Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@Validated @RequestBody SysConfig config)
- {
- if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
- {
- return AjaxResult.error("鏂板鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
- }
- config.setCreateBy(SecurityUtils.getUsername());
- return toAjax(configService.insertConfig(config));
- }
-
- /**
- * 淇敼鍙傛暟閰嶇疆
- */
- @PreAuthorize("@ss.hasPermi('system:config:edit')")
- @Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@Validated @RequestBody SysConfig config)
- {
- if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
- {
- return AjaxResult.error("淇敼鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
- }
- config.setUpdateBy(SecurityUtils.getUsername());
- return toAjax(configService.updateConfig(config));
- }
-
- /**
- * 鍒犻櫎鍙傛暟閰嶇疆
- */
- @PreAuthorize("@ss.hasPermi('system:config:remove')")
- @Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{configIds}")
- public AjaxResult remove(@PathVariable Long[] configIds)
- {
- return toAjax(configService.deleteConfigByIds(configIds));
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
deleted file mode 100644
index 314af5d9..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.ruoyi.project.system.controller;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.SysDept;
-import com.ruoyi.project.system.service.ISysDeptService;
-
-/**
- * 閮ㄩ棬淇℃伅
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/system/dept")
-public class SysDeptController extends BaseController
-{
- @Autowired
- private ISysDeptService deptService;
-
- /**
- * 鑾峰彇閮ㄩ棬鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('system:dept:list')")
- @GetMapping("/list")
- public AjaxResult list(SysDept dept)
- {
- List depts = deptService.selectDeptList(dept);
- return AjaxResult.success(deptService.buildDeptTree(depts));
- }
-
- /**
- * 鏍规嵁閮ㄩ棬缂栧彿鑾峰彇璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('system:dept:query')")
- @GetMapping(value = "/{deptId}")
- public AjaxResult getInfo(@PathVariable Long deptId)
- {
- return AjaxResult.success(deptService.selectDeptById(deptId));
- }
-
- /**
- * 鑾峰彇閮ㄩ棬涓嬫媺鏍戝垪琛
- */
- @GetMapping("/treeselect")
- public AjaxResult treeselect(SysDept dept)
- {
- List depts = deptService.selectDeptList(dept);
- return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
- }
-
- /**
- * 鍔犺浇瀵瑰簲瑙掕壊閮ㄩ棬鍒楄〃鏍
- */
- @GetMapping(value = "/roleDeptTreeselect/{roleId}")
- public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId)
- {
- List depts = deptService.selectDeptList(new SysDept());
- AjaxResult ajax = AjaxResult.success();
- ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
- ajax.put("depts", deptService.buildDeptTreeSelect(depts));
- return ajax;
- }
-
- /**
- * 鏂板閮ㄩ棬
- */
- @PreAuthorize("@ss.hasPermi('system:dept:add')")
- @Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@Validated @RequestBody SysDept dept)
- {
- if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
- {
- return AjaxResult.error("鏂板閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛岄儴闂ㄥ悕绉板凡瀛樺湪");
- }
- dept.setCreateBy(SecurityUtils.getUsername());
- return toAjax(deptService.insertDept(dept));
- }
-
- /**
- * 淇敼閮ㄩ棬
- */
- @PreAuthorize("@ss.hasPermi('system:dept:edit')")
- @Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@Validated @RequestBody SysDept dept)
- {
- if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
- {
- return AjaxResult.error("淇敼閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛岄儴闂ㄥ悕绉板凡瀛樺湪");
- }
- else if (dept.getParentId().equals(dept.getDeptId()))
- {
- return AjaxResult.error("淇敼閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛屼笂绾ч儴闂ㄤ笉鑳芥槸鑷繁");
- }
- dept.setUpdateBy(SecurityUtils.getUsername());
- return toAjax(deptService.updateDept(dept));
- }
-
- /**
- * 鍒犻櫎閮ㄩ棬
- */
- @PreAuthorize("@ss.hasPermi('system:dept:remove')")
- @Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{deptId}")
- public AjaxResult remove(@PathVariable Long deptId)
- {
- if (deptService.hasChildByDeptId(deptId))
- {
- return AjaxResult.error("瀛樺湪涓嬬骇閮ㄩ棬,涓嶅厑璁稿垹闄");
- }
- if (deptService.checkDeptExistUser(deptId))
- {
- return AjaxResult.error("閮ㄩ棬瀛樺湪鐢ㄦ埛,涓嶅厑璁稿垹闄");
- }
- return toAjax(deptService.deleteDeptById(deptId));
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java
deleted file mode 100644
index 60becb14..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.ruoyi.project.system.controller;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.domain.SysDictData;
-import com.ruoyi.project.system.service.ISysDictDataService;
-
-/**
- * 鏁版嵁瀛楀吀淇℃伅
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/system/dict/data")
-public class SysDictDataController extends BaseController
-{
- @Autowired
- private ISysDictDataService dictDataService;
-
- @PreAuthorize("@ss.hasPermi('system:dict:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysDictData dictData)
- {
- startPage();
- List list = dictDataService.selectDictDataList(dictData);
- return getDataTable(list);
- }
-
- @Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:dict:export')")
- @GetMapping("/export")
- public AjaxResult export(SysDictData dictData)
- {
- List list = dictDataService.selectDictDataList(dictData);
- ExcelUtil util = new ExcelUtil(SysDictData.class);
- return util.exportExcel(list, "瀛楀吀鏁版嵁");
- }
-
- /**
- * 鏌ヨ瀛楀吀鏁版嵁璇︾粏
- */
- @PreAuthorize("@ss.hasPermi('system:dict:query')")
- @GetMapping(value = "/{dictCode}")
- public AjaxResult getInfo(@PathVariable Long dictCode)
- {
- return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
- }
-
- /**
- * 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅
- */
- @GetMapping(value = "/dictType/{dictType}")
- public AjaxResult dictType(@PathVariable String dictType)
- {
- return AjaxResult.success(dictDataService.selectDictDataByType(dictType));
- }
-
- /**
- * 鏂板瀛楀吀绫诲瀷
- */
- @PreAuthorize("@ss.hasPermi('system:dict:add')")
- @Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@Validated @RequestBody SysDictData dict)
- {
- dict.setCreateBy(SecurityUtils.getUsername());
- return toAjax(dictDataService.insertDictData(dict));
- }
-
- /**
- * 淇敼淇濆瓨瀛楀吀绫诲瀷
- */
- @PreAuthorize("@ss.hasPermi('system:dict:edit')")
- @Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@Validated @RequestBody SysDictData dict)
- {
- dict.setUpdateBy(SecurityUtils.getUsername());
- return toAjax(dictDataService.updateDictData(dict));
- }
-
- /**
- * 鍒犻櫎瀛楀吀绫诲瀷
- */
- @PreAuthorize("@ss.hasPermi('system:dict:remove')")
- @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
- @DeleteMapping("/{dictCodes}")
- public AjaxResult remove(@PathVariable Long[] dictCodes)
- {
- return toAjax(dictDataService.deleteDictDataByIds(dictCodes));
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java
deleted file mode 100644
index 42362066..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.ruoyi.project.system.controller;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.domain.SysDictType;
-import com.ruoyi.project.system.service.ISysDictTypeService;
-
-/**
- * 鏁版嵁瀛楀吀淇℃伅
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/system/dict/type")
-public class SysDictTypeController extends BaseController
-{
- @Autowired
- private ISysDictTypeService dictTypeService;
-
- @PreAuthorize("@ss.hasPermi('system:dict:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysDictType dictType)
- {
- startPage();
- List list = dictTypeService.selectDictTypeList(dictType);
- return getDataTable(list);
- }
-
- @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:dict:export')")
- @GetMapping("/export")
- public AjaxResult export(SysDictType dictType)
- {
- List list = dictTypeService.selectDictTypeList(dictType);
- ExcelUtil util = new ExcelUtil(SysDictType.class);
- return util.exportExcel(list, "瀛楀吀绫诲瀷");
- }
-
- /**
- * 鏌ヨ瀛楀吀绫诲瀷璇︾粏
- */
- @PreAuthorize("@ss.hasPermi('system:dict:query')")
- @GetMapping(value = "/{dictId}")
- public AjaxResult getInfo(@PathVariable Long dictId)
- {
- return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
- }
-
- /**
- * 鏂板瀛楀吀绫诲瀷
- */
- @PreAuthorize("@ss.hasPermi('system:dict:add')")
- @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@Validated @RequestBody SysDictType dict)
- {
- if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
- {
- return AjaxResult.error("鏂板瀛楀吀'" + dict.getDictName() + "'澶辫触锛屽瓧鍏哥被鍨嬪凡瀛樺湪");
- }
- dict.setCreateBy(SecurityUtils.getUsername());
- return toAjax(dictTypeService.insertDictType(dict));
- }
-
- /**
- * 淇敼瀛楀吀绫诲瀷
- */
- @PreAuthorize("@ss.hasPermi('system:dict:edit')")
- @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@Validated @RequestBody SysDictType dict)
- {
- if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
- {
- return AjaxResult.error("淇敼瀛楀吀'" + dict.getDictName() + "'澶辫触锛屽瓧鍏哥被鍨嬪凡瀛樺湪");
- }
- dict.setUpdateBy(SecurityUtils.getUsername());
- return toAjax(dictTypeService.updateDictType(dict));
- }
-
- /**
- * 鍒犻櫎瀛楀吀绫诲瀷
- */
- @PreAuthorize("@ss.hasPermi('system:dict:remove')")
- @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
- @DeleteMapping("/{dictIds}")
- public AjaxResult remove(@PathVariable Long[] dictIds)
- {
- return toAjax(dictTypeService.deleteDictTypeByIds(dictIds));
- }
-
- /**
- * 鑾峰彇瀛楀吀閫夋嫨妗嗗垪琛
- */
- @GetMapping("/optionselect")
- public AjaxResult optionselect()
- {
- List dictTypes = dictTypeService.selectDictTypeAll();
- return AjaxResult.success(dictTypes);
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
deleted file mode 100644
index d7bf9235..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.ruoyi.project.system.controller;
-
-import java.util.List;
-import java.util.Set;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.security.service.SysLoginService;
-import com.ruoyi.framework.security.service.SysPermissionService;
-import com.ruoyi.framework.security.service.TokenService;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.SysMenu;
-import com.ruoyi.project.system.domain.SysUser;
-import com.ruoyi.project.system.service.ISysMenuService;
-
-/**
- * 鐧诲綍楠岃瘉
- *
- * @author ruoyi
- */
-@RestController
-public class SysLoginController
-{
- @Autowired
- private SysLoginService loginService;
-
- @Autowired
- private ISysMenuService menuService;
-
- @Autowired
- private SysPermissionService permissionService;
-
- @Autowired
- private TokenService tokenService;
-
- /**
- * 鐧诲綍鏂规硶
- *
- * @param username 鐢ㄦ埛鍚
- * @param password 瀵嗙爜
- * @param captcha 楠岃瘉鐮
- * @param uuid 鍞竴鏍囪瘑
- * @return 缁撴灉
- */
- @PostMapping("/login")
- public AjaxResult login(String username, String password, String code, String uuid)
- {
- AjaxResult ajax = AjaxResult.success();
- // 鐢熸垚浠ょ墝
- String token = loginService.login(username, password, code, uuid);
- ajax.put(Constants.TOKEN, token);
- return ajax;
- }
-
- /**
- * 鑾峰彇鐢ㄦ埛淇℃伅
- *
- * @return 鐢ㄦ埛淇℃伅
- */
- @GetMapping("getInfo")
- public AjaxResult getInfo()
- {
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- SysUser user = loginUser.getUser();
- // 瑙掕壊闆嗗悎
- Set roles = permissionService.getRolePermission(user);
- // 鏉冮檺闆嗗悎
- Set permissions = permissionService.getMenuPermission(user);
- AjaxResult ajax = AjaxResult.success();
- ajax.put("user", user);
- ajax.put("roles", roles);
- ajax.put("permissions", permissions);
- return ajax;
- }
-
- /**
- * 鑾峰彇璺敱淇℃伅
- *
- * @return 璺敱淇℃伅
- */
- @GetMapping("getRouters")
- public AjaxResult getRouters()
- {
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- // 鐢ㄦ埛淇℃伅
- SysUser user = loginUser.getUser();
- List menus = menuService.selectMenuTreeByUserId(user.getUserId());
- return AjaxResult.success(menuService.buildMenus(menus));
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
deleted file mode 100644
index 0cb277ed..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.ruoyi.project.system.controller;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.security.service.TokenService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.SysMenu;
-import com.ruoyi.project.system.service.ISysMenuService;
-
-/**
- * 鑿滃崟淇℃伅
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/system/menu")
-public class SysMenuController extends BaseController
-{
- @Autowired
- private ISysMenuService menuService;
-
- @Autowired
- private TokenService tokenService;
-
- /**
- * 鑾峰彇鑿滃崟鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('system:menu:list')")
- @GetMapping("/list")
- public AjaxResult list(SysMenu menu)
- {
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- Long userId = loginUser.getUser().getUserId();
- List menus = menuService.selectMenuList(menu, userId);
- return AjaxResult.success(menuService.buildMenuTree(menus));
- }
-
- /**
- * 鏍规嵁鑿滃崟缂栧彿鑾峰彇璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('system:menu:query')")
- @GetMapping(value = "/{menuId}")
- public AjaxResult getInfo(@PathVariable Long menuId)
- {
- return AjaxResult.success(menuService.selectMenuById(menuId));
- }
-
- /**
- * 鑾峰彇鑿滃崟涓嬫媺鏍戝垪琛
- */
- @GetMapping("/treeselect")
- public AjaxResult treeselect(SysMenu menu)
- {
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- Long userId = loginUser.getUser().getUserId();
- List menus = menuService.selectMenuList(menu, userId);
- return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
- }
-
- /**
- * 鍔犺浇瀵瑰簲瑙掕壊鑿滃崟鍒楄〃鏍
- */
- @GetMapping(value = "/roleMenuTreeselect/{roleId}")
- public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
- {
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- List menus = menuService.selectMenuList(loginUser.getUser().getUserId());
- AjaxResult ajax = AjaxResult.success();
- ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
- ajax.put("menus", menuService.buildMenuTreeSelect(menus));
- return ajax;
- }
-
- /**
- * 鏂板鑿滃崟
- */
- @PreAuthorize("@ss.hasPermi('system:menu:add')")
- @Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@Validated @RequestBody SysMenu menu)
- {
- if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
- {
- return AjaxResult.error("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛岃彍鍗曞悕绉板凡瀛樺湪");
- }
- menu.setCreateBy(SecurityUtils.getUsername());
- return toAjax(menuService.insertMenu(menu));
- }
-
- /**
- * 淇敼鑿滃崟
- */
- @PreAuthorize("@ss.hasPermi('system:menu:edit')")
- @Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@Validated @RequestBody SysMenu menu)
- {
- if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
- {
- return AjaxResult.error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛岃彍鍗曞悕绉板凡瀛樺湪");
- }
- menu.setUpdateBy(SecurityUtils.getUsername());
- return toAjax(menuService.updateMenu(menu));
- }
-
- /**
- * 鍒犻櫎鑿滃崟
- */
- @PreAuthorize("@ss.hasPermi('system:menu:remove')")
- @Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{menuId}")
- public AjaxResult remove(@PathVariable("menuId") Long menuId)
- {
- if (menuService.hasChildByMenuId(menuId))
- {
- return AjaxResult.error("瀛樺湪瀛愯彍鍗,涓嶅厑璁稿垹闄");
- }
- if (menuService.checkMenuExistRole(menuId))
- {
- return AjaxResult.error("鑿滃崟宸插垎閰,涓嶅厑璁稿垹闄");
- }
- return toAjax(menuService.deleteMenuById(menuId));
- }
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
deleted file mode 100644
index 24350533..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.ruoyi.project.system.controller;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.domain.SysNotice;
-import com.ruoyi.project.system.service.ISysNoticeService;
-
-/**
- * 鍏憡 淇℃伅鎿嶄綔澶勭悊
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/system/notice")
-public class SysNoticeController extends BaseController
-{
- @Autowired
- private ISysNoticeService noticeService;
-
- /**
- * 鑾峰彇閫氱煡鍏憡鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('system:notice:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysNotice notice)
- {
- startPage();
- List list = noticeService.selectNoticeList(notice);
- return getDataTable(list);
- }
-
- /**
- * 鏍规嵁閫氱煡鍏憡缂栧彿鑾峰彇璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('system:notice:query')")
- @GetMapping(value = "/{noticeId}")
- public AjaxResult getInfo(@PathVariable Long noticeId)
- {
- return AjaxResult.success(noticeService.selectNoticeById(noticeId));
- }
-
- /**
- * 鏂板閫氱煡鍏憡
- */
- @PreAuthorize("@ss.hasPermi('system:notice:add')")
- @Log(title = "閫氱煡鍏憡", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@Validated @RequestBody SysNotice notice)
- {
- notice.setCreateBy(SecurityUtils.getUsername());
- return toAjax(noticeService.insertNotice(notice));
- }
-
- /**
- * 淇敼閫氱煡鍏憡
- */
- @PreAuthorize("@ss.hasPermi('system:notice:edit')")
- @Log(title = "閫氱煡鍏憡", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@Validated @RequestBody SysNotice notice)
- {
- notice.setUpdateBy(SecurityUtils.getUsername());
- return toAjax(noticeService.updateNotice(notice));
- }
-
- /**
- * 鍒犻櫎閫氱煡鍏憡
- */
- @PreAuthorize("@ss.hasPermi('system:notice:remove')")
- @Log(title = "閫氱煡鍏憡", businessType = BusinessType.DELETE)
- @DeleteMapping("/{noticeId}")
- public AjaxResult remove(@PathVariable Long noticeId)
- {
- return toAjax(noticeService.deleteNoticeById(noticeId));
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysPostController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
deleted file mode 100644
index f40f7693..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.ruoyi.project.system.controller;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.domain.SysPost;
-import com.ruoyi.project.system.service.ISysPostService;
-
-/**
- * 宀椾綅淇℃伅鎿嶄綔澶勭悊
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/system/post")
-public class SysPostController extends BaseController
-{
- @Autowired
- private ISysPostService postService;
-
- /**
- * 鑾峰彇宀椾綅鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('system:post:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysPost post)
- {
- startPage();
- List list = postService.selectPostList(post);
- return getDataTable(list);
- }
-
- @Log(title = "宀椾綅绠＄悊", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:config:export')")
- @GetMapping("/export")
- public AjaxResult export(SysPost post)
- {
- List list = postService.selectPostList(post);
- ExcelUtil util = new ExcelUtil(SysPost.class);
- return util.exportExcel(list, "宀椾綅鏁版嵁");
- }
-
- /**
- * 鏍规嵁宀椾綅缂栧彿鑾峰彇璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('system:post:query')")
- @GetMapping(value = "/{postId}")
- public AjaxResult getInfo(@PathVariable Long postId)
- {
- return AjaxResult.success(postService.selectPostById(postId));
- }
-
- /**
- * 鏂板宀椾綅
- */
- @PreAuthorize("@ss.hasPermi('system:post:add')")
- @Log(title = "宀椾綅绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@Validated @RequestBody SysPost post)
- {
- if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
- {
- return AjaxResult.error("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪");
- }
- else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
- {
- return AjaxResult.error("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪");
- }
- post.setCreateBy(SecurityUtils.getUsername());
- return toAjax(postService.insertPost(post));
- }
-
- /**
- * 淇敼宀椾綅
- */
- @PreAuthorize("@ss.hasPermi('system:post:edit')")
- @Log(title = "宀椾綅绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@Validated @RequestBody SysPost post)
- {
- if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
- {
- return AjaxResult.error("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪");
- }
- else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
- {
- return AjaxResult.error("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪");
- }
- post.setUpdateBy(SecurityUtils.getUsername());
- return toAjax(postService.updatePost(post));
- }
-
- /**
- * 鍒犻櫎宀椾綅
- */
- @PreAuthorize("@ss.hasPermi('system:post:remove')")
- @Log(title = "宀椾綅绠＄悊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{postIds}")
- public AjaxResult remove(@PathVariable Long[] postIds)
- {
- return toAjax(postService.deletePostByIds(postIds));
- }
-
- /**
- * 鑾峰彇宀椾綅閫夋嫨妗嗗垪琛
- */
- @GetMapping("/optionselect")
- public AjaxResult optionselect()
- {
- List posts = postService.selectPostAll();
- return AjaxResult.success(posts);
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java
deleted file mode 100644
index 8b0b38e1..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.ruoyi.project.system.controller;
-
-import java.io.IOException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.config.RuoYiConfig;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.security.service.TokenService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.SysUser;
-import com.ruoyi.project.system.service.ISysUserService;
-
-/**
- * 涓汉淇℃伅 涓氬姟澶勭悊
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/system/user/profile")
-public class SysProfileController extends BaseController
-{
- @Autowired
- private ISysUserService userService;
-
- @Autowired
- private TokenService tokenService;
-
- /**
- * 涓汉淇℃伅
- */
- @GetMapping
- public AjaxResult profile()
- {
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- SysUser user = loginUser.getUser();
- AjaxResult ajax = AjaxResult.success(user);
- ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
- ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
- return ajax;
- }
-
- /**
- * 淇敼鐢ㄦ埛
- */
- @Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult updateProfile(@RequestBody SysUser user)
- {
- if (userService.updateUserProfile(user) > 0)
- {
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- // 鏇存柊缂撳瓨鐢ㄦ埛淇℃伅
- loginUser.getUser().setNickName(user.getNickName());
- loginUser.getUser().setPhonenumber(user.getPhonenumber());
- loginUser.getUser().setEmail(user.getEmail());
- loginUser.getUser().setSex(user.getSex());
- tokenService.setLoginUser(loginUser);
- return AjaxResult.success();
- }
- return AjaxResult.error("淇敼涓汉淇℃伅寮傚父锛岃鑱旂郴绠＄悊鍛");
- }
-
- /**
- * 閲嶇疆瀵嗙爜
- */
- @Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE)
- @PutMapping("/updatePwd")
- public AjaxResult updatePwd(String oldPassword, String newPassword)
- {
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- String userName = loginUser.getUsername();
- String password = loginUser.getPassword();
- if (!SecurityUtils.matchesPassword(oldPassword, password))
- {
- return AjaxResult.error("淇敼瀵嗙爜澶辫触锛屾棫瀵嗙爜閿欒");
- }
- if (SecurityUtils.matchesPassword(newPassword, password))
- {
- return AjaxResult.error("鏂板瘑鐮佷笉鑳戒笌鏃у瘑鐮佺浉鍚");
- }
- if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
- {
- // 鏇存柊缂撳瓨鐢ㄦ埛瀵嗙爜
- loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
- tokenService.setLoginUser(loginUser);
- return AjaxResult.success();
- }
- return AjaxResult.error("淇敼瀵嗙爜寮傚父锛岃鑱旂郴绠＄悊鍛");
- }
-
- /**
- * 澶村儚涓婁紶
- */
- @Log(title = "鐢ㄦ埛澶村儚", businessType = BusinessType.UPDATE)
- @PostMapping("/avatar")
- public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException
- {
- if (!file.isEmpty())
- {
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file);
- if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
- {
- AjaxResult ajax = AjaxResult.success();
- ajax.put("imgUrl", avatar);
- // 鏇存柊缂撳瓨鐢ㄦ埛澶村儚
- loginUser.getUser().setAvatar(avatar);
- tokenService.setLoginUser(loginUser);
- return ajax;
- }
- }
- return AjaxResult.error("涓婁紶鍥剧墖寮傚父锛岃鑱旂郴绠＄悊鍛");
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java
deleted file mode 100644
index 62ab8584..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package com.ruoyi.project.system.controller;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.domain.SysRole;
-import com.ruoyi.project.system.service.ISysRoleService;
-
-/**
- * 瑙掕壊淇℃伅
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/system/role")
-public class SysRoleController extends BaseController
-{
- @Autowired
- private ISysRoleService roleService;
-
- @PreAuthorize("@ss.hasPermi('system:role:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysRole role)
- {
- startPage();
- List list = roleService.selectRoleList(role);
- return getDataTable(list);
- }
-
- @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:role:export')")
- @GetMapping("/export")
- public AjaxResult export(SysRole role)
- {
- List list = roleService.selectRoleList(role);
- ExcelUtil util = new ExcelUtil(SysRole.class);
- return util.exportExcel(list, "瑙掕壊鏁版嵁");
- }
-
- /**
- * 鏍规嵁瑙掕壊缂栧彿鑾峰彇璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('system:role:query')")
- @GetMapping(value = "/{roleId}")
- public AjaxResult getInfo(@PathVariable Long roleId)
- {
- return AjaxResult.success(roleService.selectRoleById(roleId));
- }
-
- /**
- * 鏂板瑙掕壊
- */
- @PreAuthorize("@ss.hasPermi('system:role:add')")
- @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@Validated @RequestBody SysRole role)
- {
- if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
- {
- return AjaxResult.error("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹插悕绉板凡瀛樺湪");
- }
- else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
- {
- return AjaxResult.error("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹叉潈闄愬凡瀛樺湪");
- }
- role.setCreateBy(SecurityUtils.getUsername());
- return toAjax(roleService.insertRole(role));
-
- }
-
- /**
- * 淇敼淇濆瓨瑙掕壊
- */
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
- @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@Validated @RequestBody SysRole role)
- {
- roleService.checkRoleAllowed(role);
- if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
- {
- return AjaxResult.error("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹插悕绉板凡瀛樺湪");
- }
- else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
- {
- return AjaxResult.error("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹叉潈闄愬凡瀛樺湪");
- }
- role.setUpdateBy(SecurityUtils.getUsername());
- return toAjax(roleService.updateRole(role));
- }
-
- /**
- * 淇敼淇濆瓨鏁版嵁鏉冮檺
- */
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
- @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping("/dataScope")
- public AjaxResult dataScope(@RequestBody SysRole role)
- {
- roleService.checkRoleAllowed(role);
- return toAjax(roleService.authDataScope(role));
- }
-
- /**
- * 鐘舵佷慨鏀
- */
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
- @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping("/changeStatus")
- public AjaxResult changeStatus(@RequestBody SysRole role)
- {
- roleService.checkRoleAllowed(role);
- role.setUpdateBy(SecurityUtils.getUsername());
- return toAjax(roleService.updateRoleStatus(role));
- }
-
- /**
- * 鍒犻櫎瑙掕壊
- */
- @PreAuthorize("@ss.hasPermi('system:role:remove')")
- @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{roleIds}")
- public AjaxResult remove(@PathVariable Long[] roleIds)
- {
- return toAjax(roleService.deleteRoleByIds(roleIds));
- }
-
- /**
- * 鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛
- */
- @PreAuthorize("@ss.hasPermi('system:role:query')")
- @GetMapping("/optionselect")
- public AjaxResult optionselect()
- {
- return AjaxResult.success(roleService.selectRoleAll());
- }
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
deleted file mode 100644
index b93e8eb2..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package com.ruoyi.project.system.controller;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.security.service.TokenService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.domain.SysUser;
-import com.ruoyi.project.system.service.ISysPostService;
-import com.ruoyi.project.system.service.ISysRoleService;
-import com.ruoyi.project.system.service.ISysUserService;
-
-/**
- * 鐢ㄦ埛淇℃伅
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/system/user")
-public class SysUserController extends BaseController
-{
- @Autowired
- private ISysUserService userService;
-
- @Autowired
- private ISysRoleService roleService;
-
- @Autowired
- private ISysPostService postService;
-
- @Autowired
- private TokenService tokenService;
-
- /**
- * 鑾峰彇鐢ㄦ埛鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('system:user:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysUser user)
- {
- startPage();
- List list = userService.selectUserList(user);
- return getDataTable(list);
- }
-
- @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:user:export')")
- @GetMapping("/export")
- public AjaxResult export(SysUser user)
- {
- List list = userService.selectUserList(user);
- ExcelUtil util = new ExcelUtil(SysUser.class);
- return util.exportExcel(list, "鐢ㄦ埛鏁版嵁");
- }
-
- @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
- @PreAuthorize("@ss.hasPermi('system:user:import')")
- @PostMapping("/importData")
- public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
- {
- ExcelUtil util = new ExcelUtil(SysUser.class);
- List userList = util.importExcel(file.getInputStream());
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- String operName = loginUser.getUsername();
- String message = userService.importUser(userList, updateSupport, operName);
- return AjaxResult.success(message);
- }
-
- @GetMapping("/importTemplate")
- public AjaxResult importTemplate()
- {
- ExcelUtil util = new ExcelUtil(SysUser.class);
- return util.importTemplateExcel("鐢ㄦ埛鏁版嵁");
- }
-
- /**
- * 鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('system:user:query')")
- @GetMapping(value = { "/", "/{userId}" })
- public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
- {
- AjaxResult ajax = AjaxResult.success();
- ajax.put("roles", roleService.selectRoleAll());
- ajax.put("posts", postService.selectPostAll());
- if (StringUtils.isNotNull(userId))
- {
- ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(userId));
- ajax.put("postIds", postService.selectPostListByUserId(userId));
- ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
- }
- return ajax;
- }
-
- /**
- * 鏂板鐢ㄦ埛
- */
- @PreAuthorize("@ss.hasPermi('system:user:add')")
- @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@Validated @RequestBody SysUser user)
- {
- if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName())))
- {
- return AjaxResult.error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
- }
- else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
- {
- return AjaxResult.error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
- }
- else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
- {
- return AjaxResult.error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
- }
- user.setCreateBy(SecurityUtils.getUsername());
- user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
- return toAjax(userService.insertUser(user));
- }
-
- /**
- * 淇敼鐢ㄦ埛
- */
- @PreAuthorize("@ss.hasPermi('system:user:edit')")
- @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@Validated @RequestBody SysUser user)
- {
- userService.checkUserAllowed(user);
- if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
- {
- return AjaxResult.error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
- }
- else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
- {
- return AjaxResult.error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
- }
- user.setUpdateBy(SecurityUtils.getUsername());
- return toAjax(userService.updateUser(user));
- }
-
- /**
- * 鍒犻櫎鐢ㄦ埛
- */
- @PreAuthorize("@ss.hasPermi('system:user:remove')")
- @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{userIds}")
- public AjaxResult remove(@PathVariable Long[] userIds)
- {
- return toAjax(userService.deleteUserByIds(userIds));
- }
-
- /**
- * 閲嶇疆瀵嗙爜
- */
- @PreAuthorize("@ss.hasPermi('system:user:edit')")
- @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping("/resetPwd")
- public AjaxResult resetPwd(@RequestBody SysUser user)
- {
- userService.checkUserAllowed(user);
- user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
- user.setUpdateBy(SecurityUtils.getUsername());
- return toAjax(userService.resetPwd(user));
- }
-
- /**
- * 鐘舵佷慨鏀
- */
- @PreAuthorize("@ss.hasPermi('system:user:edit')")
- @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping("/changeStatus")
- public AjaxResult changeStatus(@RequestBody SysUser user)
- {
- userService.checkUserAllowed(user);
- user.setUpdateBy(SecurityUtils.getUsername());
- return toAjax(userService.updateUserStatus(user));
- }
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysConfig.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysConfig.java
deleted file mode 100644
index ba1c0220..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysConfig.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.ruoyi.project.system.domain;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.ruoyi.framework.web.domain.BaseEntity;
-
-/**
- * 鍙傛暟閰嶇疆琛 sys_config
- *
- * @author ruoyi
- */
-public class SysConfig extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 鍙傛暟涓婚敭 */
- @Excel(name = "鍙傛暟涓婚敭", cellType = ColumnType.NUMERIC)
- private Long configId;
-
- /** 鍙傛暟鍚嶇О */
- @Excel(name = "鍙傛暟鍚嶇О")
- private String configName;
-
- /** 鍙傛暟閿悕 */
- @Excel(name = "鍙傛暟閿悕")
- private String configKey;
-
- /** 鍙傛暟閿 */
- @Excel(name = "鍙傛暟閿")
- private String configValue;
-
- /** 绯荤粺鍐呯疆锛圷鏄 N鍚︼級 */
- @Excel(name = "绯荤粺鍐呯疆", readConverterExp = "Y=鏄,N=鍚")
- private String configType;
-
- public Long getConfigId()
- {
- return configId;
- }
-
- public void setConfigId(Long configId)
- {
- this.configId = configId;
- }
-
- @NotBlank(message = "鍙傛暟鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "鍙傛暟鍚嶇О涓嶈兘瓒呰繃100涓瓧绗")
- public String getConfigName()
- {
- return configName;
- }
-
- public void setConfigName(String configName)
- {
- this.configName = configName;
- }
-
- @NotBlank(message = "鍙傛暟閿悕闀垮害涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "鍙傛暟閿悕闀垮害涓嶈兘瓒呰繃100涓瓧绗")
- public String getConfigKey()
- {
- return configKey;
- }
-
- public void setConfigKey(String configKey)
- {
- this.configKey = configKey;
- }
-
- @NotBlank(message = "鍙傛暟閿间笉鑳戒负绌")
- @Size(min = 0, max = 500, message = "鍙傛暟閿奸暱搴︿笉鑳借秴杩500涓瓧绗")
- public String getConfigValue()
- {
- return configValue;
- }
-
- public void setConfigValue(String configValue)
- {
- this.configValue = configValue;
- }
-
- public String getConfigType()
- {
- return configType;
- }
-
- public void setConfigType(String configType)
- {
- this.configType = configType;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("configId", getConfigId())
- .append("configName", getConfigName())
- .append("configKey", getConfigKey())
- .append("configValue", getConfigValue())
- .append("configType", getConfigType())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDept.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDept.java
deleted file mode 100644
index ba12f154..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDept.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package com.ruoyi.project.system.domain;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.framework.web.domain.BaseEntity;
-
-/**
- * 閮ㄩ棬琛 sys_dept
- *
- * @author ruoyi
- */
-public class SysDept extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 閮ㄩ棬ID */
- private Long deptId;
-
- /** 鐖堕儴闂↖D */
- private Long parentId;
-
- /** 绁栫骇鍒楄〃 */
- private String ancestors;
-
- /** 閮ㄩ棬鍚嶇О */
- private String deptName;
-
- /** 鏄剧ず椤哄簭 */
- private String orderNum;
-
- /** 璐熻矗浜 */
- private String leader;
-
- /** 鑱旂郴鐢佃瘽 */
- private String phone;
-
- /** 閭 */
- private String email;
-
- /** 閮ㄩ棬鐘舵:0姝ｅ父,1鍋滅敤 */
- private String status;
-
- /** 鍒犻櫎鏍囧織锛0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛 */
- private String delFlag;
-
- /** 鐖堕儴闂ㄥ悕绉 */
- private String parentName;
-
- /** 瀛愰儴闂 */
- private List children = new ArrayList();
-
- public Long getDeptId()
- {
- return deptId;
- }
-
- public void setDeptId(Long deptId)
- {
- this.deptId = deptId;
- }
-
- public Long getParentId()
- {
- return parentId;
- }
-
- public void setParentId(Long parentId)
- {
- this.parentId = parentId;
- }
-
- public String getAncestors()
- {
- return ancestors;
- }
-
- public void setAncestors(String ancestors)
- {
- this.ancestors = ancestors;
- }
-
- @NotBlank(message = "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 30, message = "閮ㄩ棬鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗")
- public String getDeptName()
- {
- return deptName;
- }
-
- public void setDeptName(String deptName)
- {
- this.deptName = deptName;
- }
-
- @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- public String getOrderNum()
- {
- return orderNum;
- }
-
- public void setOrderNum(String orderNum)
- {
- this.orderNum = orderNum;
- }
-
- public String getLeader()
- {
- return leader;
- }
-
- public void setLeader(String leader)
- {
- this.leader = leader;
- }
-
- @Size(min = 0, max = 11, message = "鑱旂郴鐢佃瘽闀垮害涓嶈兘瓒呰繃11涓瓧绗")
- public String getPhone()
- {
- return phone;
- }
-
- public void setPhone(String phone)
- {
- this.phone = phone;
- }
-
- @Email(message = "閭鏍煎紡涓嶆纭")
- @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗")
- public String getEmail()
- {
- return email;
- }
-
- public void setEmail(String email)
- {
- this.email = email;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- public String getDelFlag()
- {
- return delFlag;
- }
-
- public void setDelFlag(String delFlag)
- {
- this.delFlag = delFlag;
- }
-
- public String getParentName()
- {
- return parentName;
- }
-
- public void setParentName(String parentName)
- {
- this.parentName = parentName;
- }
-
- public List getChildren()
- {
- return children;
- }
-
- public void setChildren(List children)
- {
- this.children = children;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("deptId", getDeptId())
- .append("parentId", getParentId())
- .append("ancestors", getAncestors())
- .append("deptName", getDeptName())
- .append("orderNum", getOrderNum())
- .append("leader", getLeader())
- .append("phone", getPhone())
- .append("email", getEmail())
- .append("status", getStatus())
- .append("delFlag", getDelFlag())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .toString();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDictData.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDictData.java
deleted file mode 100644
index 8f7ec614..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDictData.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package com.ruoyi.project.system.domain;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.ruoyi.framework.web.domain.BaseEntity;
-
-/**
- * 瀛楀吀鏁版嵁琛 sys_dict_data
- *
- * @author ruoyi
- */
-public class SysDictData extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 瀛楀吀缂栫爜 */
- @Excel(name = "瀛楀吀缂栫爜", cellType = ColumnType.NUMERIC)
- private Long dictCode;
-
- /** 瀛楀吀鎺掑簭 */
- @Excel(name = "瀛楀吀鎺掑簭", cellType = ColumnType.NUMERIC)
- private Long dictSort;
-
- /** 瀛楀吀鏍囩 */
- @Excel(name = "瀛楀吀鏍囩")
- private String dictLabel;
-
- /** 瀛楀吀閿 */
- @Excel(name = "瀛楀吀閿")
- private String dictValue;
-
- /** 瀛楀吀绫诲瀷 */
- @Excel(name = "瀛楀吀绫诲瀷")
- private String dictType;
-
- /** 鏍峰紡灞炴э紙鍏朵粬鏍峰紡鎵╁睍锛 */
- private String cssClass;
-
- /** 琛ㄦ牸瀛楀吀鏍峰紡 */
- private String listClass;
-
- /** 鏄惁榛樿锛圷鏄 N鍚︼級 */
- @Excel(name = "鏄惁榛樿", readConverterExp = "Y=鏄,N=鍚")
- private String isDefault;
-
- /** 鐘舵侊紙0姝ｅ父 1鍋滅敤锛 */
- @Excel(name = "鐘舵", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
- private String status;
-
- public Long getDictCode()
- {
- return dictCode;
- }
-
- public void setDictCode(Long dictCode)
- {
- this.dictCode = dictCode;
- }
-
- public Long getDictSort()
- {
- return dictSort;
- }
-
- public void setDictSort(Long dictSort)
- {
- this.dictSort = dictSort;
- }
-
- @NotBlank(message = "瀛楀吀鏍囩涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "瀛楀吀鏍囩闀垮害涓嶈兘瓒呰繃100涓瓧绗")
- public String getDictLabel()
- {
- return dictLabel;
- }
-
- public void setDictLabel(String dictLabel)
- {
- this.dictLabel = dictLabel;
- }
-
- @NotBlank(message = "瀛楀吀閿间笉鑳戒负绌")
- @Size(min = 0, max = 100, message = "瀛楀吀閿奸暱搴︿笉鑳借秴杩100涓瓧绗")
- public String getDictValue()
- {
- return dictValue;
- }
-
- public void setDictValue(String dictValue)
- {
- this.dictValue = dictValue;
- }
-
- @NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷闀垮害涓嶈兘瓒呰繃100涓瓧绗")
- public String getDictType()
- {
- return dictType;
- }
-
- public void setDictType(String dictType)
- {
- this.dictType = dictType;
- }
-
- @Size(min = 0, max = 100, message = "鏍峰紡灞炴ч暱搴︿笉鑳借秴杩100涓瓧绗")
- public String getCssClass()
- {
- return cssClass;
- }
-
- public void setCssClass(String cssClass)
- {
- this.cssClass = cssClass;
- }
-
- public String getListClass()
- {
- return listClass;
- }
-
- public void setListClass(String listClass)
- {
- this.listClass = listClass;
- }
-
- public boolean getDefault()
- {
- return UserConstants.YES.equals(this.isDefault) ? true : false;
- }
-
- public String getIsDefault()
- {
- return isDefault;
- }
-
- public void setIsDefault(String isDefault)
- {
- this.isDefault = isDefault;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("dictCode", getDictCode())
- .append("dictSort", getDictSort())
- .append("dictLabel", getDictLabel())
- .append("dictValue", getDictValue())
- .append("dictType", getDictType())
- .append("cssClass", getCssClass())
- .append("listClass", getListClass())
- .append("isDefault", getIsDefault())
- .append("status", getStatus())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDictType.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDictType.java
deleted file mode 100644
index a800f690..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDictType.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.ruoyi.project.system.domain;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.ruoyi.framework.web.domain.BaseEntity;
-
-/**
- * 瀛楀吀绫诲瀷琛 sys_dict_type
- *
- * @author ruoyi
- */
-public class SysDictType extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 瀛楀吀涓婚敭 */
- @Excel(name = "瀛楀吀涓婚敭", cellType = ColumnType.NUMERIC)
- private Long dictId;
-
- /** 瀛楀吀鍚嶇О */
- @Excel(name = "瀛楀吀鍚嶇О")
- private String dictName;
-
- /** 瀛楀吀绫诲瀷 */
- @Excel(name = "瀛楀吀绫诲瀷")
- private String dictType;
-
- /** 鐘舵侊紙0姝ｅ父 1鍋滅敤锛 */
- @Excel(name = "鐘舵", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
- private String status;
-
- public Long getDictId()
- {
- return dictId;
- }
-
- public void setDictId(Long dictId)
- {
- this.dictId = dictId;
- }
-
- @NotBlank(message = "瀛楀吀鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷鍚嶇О闀垮害涓嶈兘瓒呰繃100涓瓧绗")
- public String getDictName()
- {
- return dictName;
- }
-
- public void setDictName(String dictName)
- {
- this.dictName = dictName;
- }
-
- @NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷绫诲瀷闀垮害涓嶈兘瓒呰繃100涓瓧绗")
- public String getDictType()
- {
- return dictType;
- }
-
- public void setDictType(String dictType)
- {
- this.dictType = dictType;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("dictId", getDictId())
- .append("dictName", getDictName())
- .append("dictType", getDictType())
- .append("status", getStatus())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysMenu.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysMenu.java
deleted file mode 100644
index baeeeed2..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysMenu.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package com.ruoyi.project.system.domain;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.framework.web.domain.BaseEntity;
-
-/**
- * 鑿滃崟鏉冮檺琛 sys_menu
- *
- * @author ruoyi
- */
-public class SysMenu extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 鑿滃崟ID */
- private Long menuId;
-
- /** 鑿滃崟鍚嶇О */
- private String menuName;
-
- /** 鐖惰彍鍗曞悕绉 */
- private String parentName;
-
- /** 鐖惰彍鍗旾D */
- private Long parentId;
-
- /** 鏄剧ず椤哄簭 */
- private String orderNum;
-
- /** 璺敱鍦板潃 */
- private String path;
-
- /** 缁勪欢璺緞 */
- private String component;
-
- /** 鏄惁涓哄閾撅紙0鏄 1鍚︼級 */
- private String isFrame;
-
- /** 绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛 */
- private String menuType;
-
- /** 鑿滃崟鐘舵:0鏄剧ず,1闅愯棌 */
- private String visible;
-
- /** 鏉冮檺瀛楃涓 */
- private String perms;
-
- /** 鑿滃崟鍥炬爣 */
- private String icon;
-
- /** 瀛愯彍鍗 */
- private List children = new ArrayList();
-
- public Long getMenuId()
- {
- return menuId;
- }
-
- public void setMenuId(Long menuId)
- {
- this.menuId = menuId;
- }
-
- @NotBlank(message = "鑿滃崟鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 50, message = "鑿滃崟鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗")
- public String getMenuName()
- {
- return menuName;
- }
-
- public void setMenuName(String menuName)
- {
- this.menuName = menuName;
- }
-
- public String getParentName()
- {
- return parentName;
- }
-
- public void setParentName(String parentName)
- {
- this.parentName = parentName;
- }
-
- public Long getParentId()
- {
- return parentId;
- }
-
- public void setParentId(Long parentId)
- {
- this.parentId = parentId;
- }
-
- @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- public String getOrderNum()
- {
- return orderNum;
- }
-
- public void setOrderNum(String orderNum)
- {
- this.orderNum = orderNum;
- }
-
- @Size(min = 0, max = 200, message = "璺敱鍦板潃涓嶈兘瓒呰繃200涓瓧绗")
- public String getPath()
- {
- return path;
- }
-
- public void setPath(String path)
- {
- this.path = path;
- }
-
- @Size(min = 0, max = 200, message = "缁勪欢璺緞涓嶈兘瓒呰繃255涓瓧绗")
- public String getComponent()
- {
- return component;
- }
-
- public void setComponent(String component)
- {
- this.component = component;
- }
-
- public String getIsFrame()
- {
- return isFrame;
- }
-
- public void setIsFrame(String isFrame)
- {
- this.isFrame = isFrame;
- }
-
- @NotBlank(message = "鑿滃崟绫诲瀷涓嶈兘涓虹┖")
- public String getMenuType()
- {
- return menuType;
- }
-
- public void setMenuType(String menuType)
- {
- this.menuType = menuType;
- }
-
- public String getVisible()
- {
- return visible;
- }
-
- public void setVisible(String visible)
- {
- this.visible = visible;
- }
-
- @Size(min = 0, max = 100, message = "鏉冮檺鏍囪瘑闀垮害涓嶈兘瓒呰繃100涓瓧绗")
- public String getPerms()
- {
- return perms;
- }
-
- public void setPerms(String perms)
- {
- this.perms = perms;
- }
-
- public String getIcon()
- {
- return icon;
- }
-
- public void setIcon(String icon)
- {
- this.icon = icon;
- }
-
- public List getChildren()
- {
- return children;
- }
-
- public void setChildren(List children)
- {
- this.children = children;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("menuId", getMenuId())
- .append("menuName", getMenuName())
- .append("parentId", getParentId())
- .append("orderNum", getOrderNum())
- .append("path", getPath())
- .append("component", getComponent())
- .append("isFrame", getIsFrame())
- .append("menuType", getMenuType())
- .append("visible", getVisible())
- .append("perms", getPerms())
- .append("icon", getIcon())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysNotice.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysNotice.java
deleted file mode 100644
index 916fd320..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysNotice.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.ruoyi.project.system.domain;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.framework.web.domain.BaseEntity;
-
-/**
- * 閫氱煡鍏憡琛 sys_notice
- *
- * @author ruoyi
- */
-public class SysNotice extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 鍏憡ID */
- private Long noticeId;
-
- /** 鍏憡鏍囬 */
- private String noticeTitle;
-
- /** 鍏憡绫诲瀷锛1閫氱煡 2鍏憡锛 */
- private String noticeType;
-
- /** 鍏憡鍐呭 */
- private String noticeContent;
-
- /** 鍏憡鐘舵侊紙0姝ｅ父 1鍏抽棴锛 */
- private String status;
-
- public Long getNoticeId()
- {
- return noticeId;
- }
-
- public void setNoticeId(Long noticeId)
- {
- this.noticeId = noticeId;
- }
-
- public void setNoticeTitle(String noticeTitle)
- {
- this.noticeTitle = noticeTitle;
- }
-
- @NotBlank(message = "鍏憡鏍囬涓嶈兘涓虹┖")
- @Size(min = 0, max = 50, message = "鍏憡鏍囬涓嶈兘瓒呰繃50涓瓧绗")
- public String getNoticeTitle()
- {
- return noticeTitle;
- }
-
- public void setNoticeType(String noticeType)
- {
- this.noticeType = noticeType;
- }
-
- public String getNoticeType()
- {
- return noticeType;
- }
-
- public void setNoticeContent(String noticeContent)
- {
- this.noticeContent = noticeContent;
- }
-
- public String getNoticeContent()
- {
- return noticeContent;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("noticeId", getNoticeId())
- .append("noticeTitle", getNoticeTitle())
- .append("noticeType", getNoticeType())
- .append("noticeContent", getNoticeContent())
- .append("status", getStatus())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysPost.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysPost.java
deleted file mode 100644
index ebafe7d9..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysPost.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.ruoyi.project.system.domain;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.ruoyi.framework.web.domain.BaseEntity;
-
-/**
- * 宀椾綅琛 sys_post
- *
- * @author ruoyi
- */
-public class SysPost extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 宀椾綅搴忓彿 */
- @Excel(name = "宀椾綅搴忓彿", cellType = ColumnType.NUMERIC)
- private Long postId;
-
- /** 宀椾綅缂栫爜 */
- @Excel(name = "宀椾綅缂栫爜")
- private String postCode;
-
- /** 宀椾綅鍚嶇О */
- @Excel(name = "宀椾綅鍚嶇О")
- private String postName;
-
- /** 宀椾綅鎺掑簭 */
- @Excel(name = "宀椾綅鎺掑簭")
- private String postSort;
-
- /** 鐘舵侊紙0姝ｅ父 1鍋滅敤锛 */
- @Excel(name = "鐘舵", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
- private String status;
-
- /** 鐢ㄦ埛鏄惁瀛樺湪姝ゅ矖浣嶆爣璇 榛樿涓嶅瓨鍦 */
- private boolean flag = false;
-
- public Long getPostId()
- {
- return postId;
- }
-
- public void setPostId(Long postId)
- {
- this.postId = postId;
- }
-
- @NotBlank(message = "宀椾綅缂栫爜涓嶈兘涓虹┖")
- @Size(min = 0, max = 64, message = "宀椾綅缂栫爜闀垮害涓嶈兘瓒呰繃64涓瓧绗")
- public String getPostCode()
- {
- return postCode;
- }
-
- public void setPostCode(String postCode)
- {
- this.postCode = postCode;
- }
-
- @NotBlank(message = "宀椾綅鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 50, message = "宀椾綅鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗")
- public String getPostName()
- {
- return postName;
- }
-
- public void setPostName(String postName)
- {
- this.postName = postName;
- }
-
- @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- public String getPostSort()
- {
- return postSort;
- }
-
- public void setPostSort(String postSort)
- {
- this.postSort = postSort;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- public boolean isFlag()
- {
- return flag;
- }
-
- public void setFlag(boolean flag)
- {
- this.flag = flag;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("postId", getPostId())
- .append("postCode", getPostCode())
- .append("postName", getPostName())
- .append("postSort", getPostSort())
- .append("status", getStatus())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java
deleted file mode 100644
index ca33e32d..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package com.ruoyi.project.system.domain;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.ruoyi.framework.web.domain.BaseEntity;
-
-/**
- * 瑙掕壊琛 sys_role
- *
- * @author ruoyi
- */
-public class SysRole extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 瑙掕壊ID */
- @Excel(name = "瑙掕壊搴忓彿", cellType = ColumnType.NUMERIC)
- private Long roleId;
-
- /** 瑙掕壊鍚嶇О */
- @Excel(name = "瑙掕壊鍚嶇О")
- private String roleName;
-
- /** 瑙掕壊鏉冮檺 */
- @Excel(name = "瑙掕壊鏉冮檺")
- private String roleKey;
-
- /** 瑙掕壊鎺掑簭 */
- @Excel(name = "瑙掕壊鎺掑簭")
- private String roleSort;
-
- /** 鏁版嵁鑼冨洿锛1锛氭墍鏈夋暟鎹潈闄愶紱2锛氳嚜瀹氫箟鏁版嵁鏉冮檺锛3锛氭湰閮ㄩ棬鏁版嵁鏉冮檺锛4锛氭湰閮ㄩ棬鍙婁互涓嬫暟鎹潈闄愶級 */
- @Excel(name = "鏁版嵁鑼冨洿", readConverterExp = "1=鎵鏈夋暟鎹潈闄,2=鑷畾涔夋暟鎹潈闄,3=鏈儴闂ㄦ暟鎹潈闄,4=鏈儴闂ㄥ強浠ヤ笅鏁版嵁鏉冮檺")
- private String dataScope;
-
- /** 瑙掕壊鐘舵侊紙0姝ｅ父 1鍋滅敤锛 */
- @Excel(name = "瑙掕壊鐘舵", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
- private String status;
-
- /** 鍒犻櫎鏍囧織锛0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛 */
- private String delFlag;
-
- /** 鐢ㄦ埛鏄惁瀛樺湪姝よ鑹叉爣璇 榛樿涓嶅瓨鍦 */
- private boolean flag = false;
-
- /** 鑿滃崟缁 */
- private Long[] menuIds;
-
- /** 閮ㄩ棬缁勶紙鏁版嵁鏉冮檺锛 */
- private Long[] deptIds;
-
- public SysRole()
- {
-
- }
-
- public SysRole(Long roleId)
- {
- this.roleId = roleId;
- }
-
- public Long getRoleId()
- {
- return roleId;
- }
-
- public void setRoleId(Long roleId)
- {
- this.roleId = roleId;
- }
-
- public boolean isAdmin()
- {
- return isAdmin(this.roleId);
- }
-
- public static boolean isAdmin(Long roleId)
- {
- return roleId != null && 1L == roleId;
- }
-
- @NotBlank(message = "瑙掕壊鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 30, message = "瑙掕壊鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗")
- public String getRoleName()
- {
- return roleName;
- }
-
- public void setRoleName(String roleName)
- {
- this.roleName = roleName;
- }
-
- @NotBlank(message = "鏉冮檺瀛楃涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "鏉冮檺瀛楃闀垮害涓嶈兘瓒呰繃100涓瓧绗")
- public String getRoleKey()
- {
- return roleKey;
- }
-
- public void setRoleKey(String roleKey)
- {
- this.roleKey = roleKey;
- }
-
- @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- public String getRoleSort()
- {
- return roleSort;
- }
-
- public void setRoleSort(String roleSort)
- {
- this.roleSort = roleSort;
- }
-
- public String getDataScope()
- {
- return dataScope;
- }
-
- public void setDataScope(String dataScope)
- {
- this.dataScope = dataScope;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- public String getDelFlag()
- {
- return delFlag;
- }
-
- public void setDelFlag(String delFlag)
- {
- this.delFlag = delFlag;
- }
-
- public boolean isFlag()
- {
- return flag;
- }
-
- public void setFlag(boolean flag)
- {
- this.flag = flag;
- }
-
- public Long[] getMenuIds()
- {
- return menuIds;
- }
-
- public void setMenuIds(Long[] menuIds)
- {
- this.menuIds = menuIds;
- }
-
- public Long[] getDeptIds()
- {
- return deptIds;
- }
-
- public void setDeptIds(Long[] deptIds)
- {
- this.deptIds = deptIds;
- }
-
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("roleId", getRoleId())
- .append("roleName", getRoleName())
- .append("roleKey", getRoleKey())
- .append("roleSort", getRoleSort())
- .append("dataScope", getDataScope())
- .append("status", getStatus())
- .append("delFlag", getDelFlag())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRoleDept.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRoleDept.java
deleted file mode 100644
index f3dbd03c..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRoleDept.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.ruoyi.project.system.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 瑙掕壊鍜岄儴闂ㄥ叧鑱 sys_role_dept
- *
- * @author ruoyi
- */
-public class SysRoleDept
-{
- /** 瑙掕壊ID */
- private Long roleId;
-
- /** 閮ㄩ棬ID */
- private Long deptId;
-
- public Long getRoleId()
- {
- return roleId;
- }
-
- public void setRoleId(Long roleId)
- {
- this.roleId = roleId;
- }
-
- public Long getDeptId()
- {
- return deptId;
- }
-
- public void setDeptId(Long deptId)
- {
- this.deptId = deptId;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("roleId", getRoleId())
- .append("deptId", getDeptId())
- .toString();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRoleMenu.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRoleMenu.java
deleted file mode 100644
index 54452296..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRoleMenu.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.ruoyi.project.system.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 瑙掕壊鍜岃彍鍗曞叧鑱 sys_role_menu
- *
- * @author ruoyi
- */
-public class SysRoleMenu
-{
- /** 瑙掕壊ID */
- private Long roleId;
-
- /** 鑿滃崟ID */
- private Long menuId;
-
- public Long getRoleId()
- {
- return roleId;
- }
-
- public void setRoleId(Long roleId)
- {
- this.roleId = roleId;
- }
-
- public Long getMenuId()
- {
- return menuId;
- }
-
- public void setMenuId(Long menuId)
- {
- this.menuId = menuId;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("roleId", getRoleId())
- .append("menuId", getMenuId())
- .toString();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
deleted file mode 100644
index 1a1963d6..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
+++ /dev/null
@@ -1,324 +0,0 @@
-package com.ruoyi.project.system.domain;
-
-import java.util.Date;
-import java.util.List;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel.Type;
-import com.ruoyi.framework.aspectj.lang.annotation.Excels;
-import com.ruoyi.framework.web.domain.BaseEntity;
-
-/**
- * 鐢ㄦ埛瀵硅薄 sys_user
- *
- * @author ruoyi
- */
-public class SysUser extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 鐢ㄦ埛ID */
- @Excel(name = "鐢ㄦ埛搴忓彿", cellType = ColumnType.NUMERIC, prompt = "鐢ㄦ埛缂栧彿")
- private Long userId;
-
- /** 閮ㄩ棬ID */
- @Excel(name = "閮ㄩ棬缂栧彿", type = Type.IMPORT)
- private Long deptId;
-
- /** 鐢ㄦ埛璐﹀彿 */
- @Excel(name = "鐧诲綍鍚嶇О")
- private String userName;
-
- /** 鐢ㄦ埛鏄电О */
- @Excel(name = "鐢ㄦ埛鍚嶇О")
- private String nickName;
-
- /** 鐢ㄦ埛閭 */
- @Excel(name = "鐢ㄦ埛閭")
- private String email;
-
- /** 鎵嬫満鍙风爜 */
- @Excel(name = "鎵嬫満鍙风爜")
- private String phonenumber;
-
- /** 鐢ㄦ埛鎬у埆 */
- @Excel(name = "鐢ㄦ埛鎬у埆", readConverterExp = "0=鐢,1=濂,2=鏈煡")
- private String sex;
-
- /** 鐢ㄦ埛澶村儚 */
- private String avatar;
-
- /** 瀵嗙爜 */
- private String password;
-
- /** 鐩愬姞瀵 */
- private String salt;
-
- /** 甯愬彿鐘舵侊紙0姝ｅ父 1鍋滅敤锛 */
- @Excel(name = "甯愬彿鐘舵", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
- private String status;
-
- /** 鍒犻櫎鏍囧織锛0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛 */
- private String delFlag;
-
- /** 鏈鍚庣櫥闄咺P */
- @Excel(name = "鏈鍚庣櫥闄咺P", type = Type.EXPORT)
- private String loginIp;
-
- /** 鏈鍚庣櫥闄嗘椂闂 */
- @Excel(name = "鏈鍚庣櫥闄嗘椂闂", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
- private Date loginDate;
-
- /** 閮ㄩ棬瀵硅薄 */
- @Excels({
- @Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT),
- @Excel(name = "閮ㄩ棬璐熻矗浜", targetAttr = "leader", type = Type.EXPORT)
- })
- private SysDept dept;
-
- /** 瑙掕壊瀵硅薄 */
- private List roles;
-
- /** 瑙掕壊缁 */
- private Long[] roleIds;
-
- /** 宀椾綅缁 */
- private Long[] postIds;
-
- public SysUser()
- {
-
- }
-
- public SysUser(Long userId)
- {
- this.userId = userId;
- }
-
- public Long getUserId()
- {
- return userId;
- }
-
- public void setUserId(Long userId)
- {
- this.userId = userId;
- }
-
- public boolean isAdmin()
- {
- return isAdmin(this.userId);
- }
-
- public static boolean isAdmin(Long userId)
- {
- return userId != null && 1L == userId;
- }
-
- public Long getDeptId()
- {
- return deptId;
- }
-
- public void setDeptId(Long deptId)
- {
- this.deptId = deptId;
- }
-
- @Size(min = 0, max = 30, message = "鐢ㄦ埛鏄电О闀垮害涓嶈兘瓒呰繃30涓瓧绗")
- public String getNickName()
- {
- return nickName;
- }
-
- public void setNickName(String nickName)
- {
- this.nickName = nickName;
- }
-
- @NotBlank(message = "鐢ㄦ埛璐﹀彿涓嶈兘涓虹┖")
- @Size(min = 0, max = 30, message = "鐢ㄦ埛璐﹀彿闀垮害涓嶈兘瓒呰繃30涓瓧绗")
- public String getUserName()
- {
- return userName;
- }
-
- public void setUserName(String userName)
- {
- this.userName = userName;
- }
-
- @Email(message = "閭鏍煎紡涓嶆纭")
- @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗")
- public String getEmail()
- {
- return email;
- }
-
- public void setEmail(String email)
- {
- this.email = email;
- }
-
- @Size(min = 0, max = 11, message = "鎵嬫満鍙风爜闀垮害涓嶈兘瓒呰繃11涓瓧绗")
- public String getPhonenumber()
- {
- return phonenumber;
- }
-
- public void setPhonenumber(String phonenumber)
- {
- this.phonenumber = phonenumber;
- }
-
- public String getSex()
- {
- return sex;
- }
-
- public void setSex(String sex)
- {
- this.sex = sex;
- }
-
- public String getAvatar()
- {
- return avatar;
- }
-
- public void setAvatar(String avatar)
- {
- this.avatar = avatar;
- }
-
- public String getPassword()
- {
- return password;
- }
-
- public void setPassword(String password)
- {
- this.password = password;
- }
-
- public String getSalt()
- {
- return salt;
- }
-
- public void setSalt(String salt)
- {
- this.salt = salt;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- public String getDelFlag()
- {
- return delFlag;
- }
-
- public void setDelFlag(String delFlag)
- {
- this.delFlag = delFlag;
- }
-
- public String getLoginIp()
- {
- return loginIp;
- }
-
- public void setLoginIp(String loginIp)
- {
- this.loginIp = loginIp;
- }
-
- public Date getLoginDate()
- {
- return loginDate;
- }
-
- public void setLoginDate(Date loginDate)
- {
- this.loginDate = loginDate;
- }
-
- public SysDept getDept()
- {
- return dept;
- }
-
- public void setDept(SysDept dept)
- {
- this.dept = dept;
- }
-
- public List getRoles()
- {
- return roles;
- }
-
- public void setRoles(List roles)
- {
- this.roles = roles;
- }
-
- public Long[] getRoleIds()
- {
- return roleIds;
- }
-
- public void setRoleIds(Long[] roleIds)
- {
- this.roleIds = roleIds;
- }
-
- public Long[] getPostIds()
- {
- return postIds;
- }
-
- public void setPostIds(Long[] postIds)
- {
- this.postIds = postIds;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("userId", getUserId())
- .append("deptId", getDeptId())
- .append("userName", getUserName())
- .append("nickName", getNickName())
- .append("email", getEmail())
- .append("phonenumber", getPhonenumber())
- .append("sex", getSex())
- .append("avatar", getAvatar())
- .append("password", getPassword())
- .append("salt", getSalt())
- .append("status", getStatus())
- .append("delFlag", getDelFlag())
- .append("loginIp", getLoginIp())
- .append("loginDate", getLoginDate())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .append("dept", getDept())
- .toString();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUserPost.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUserPost.java
deleted file mode 100644
index 1ac4bfc4..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUserPost.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.ruoyi.project.system.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 鐢ㄦ埛鍜屽矖浣嶅叧鑱 sys_user_post
- *
- * @author ruoyi
- */
-public class SysUserPost
-{
- /** 鐢ㄦ埛ID */
- private Long userId;
-
- /** 宀椾綅ID */
- private Long postId;
-
- public Long getUserId()
- {
- return userId;
- }
-
- public void setUserId(Long userId)
- {
- this.userId = userId;
- }
-
- public Long getPostId()
- {
- return postId;
- }
-
- public void setPostId(Long postId)
- {
- this.postId = postId;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("userId", getUserId())
- .append("postId", getPostId())
- .toString();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUserRole.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUserRole.java
deleted file mode 100644
index e951bf3d..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUserRole.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.ruoyi.project.system.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 鐢ㄦ埛鍜岃鑹插叧鑱 sys_user_role
- *
- * @author ruoyi
- */
-public class SysUserRole
-{
- /** 鐢ㄦ埛ID */
- private Long userId;
-
- /** 瑙掕壊ID */
- private Long roleId;
-
- public Long getUserId()
- {
- return userId;
- }
-
- public void setUserId(Long userId)
- {
- this.userId = userId;
- }
-
- public Long getRoleId()
- {
- return roleId;
- }
-
- public void setRoleId(Long roleId)
- {
- this.roleId = roleId;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("userId", getUserId())
- .append("roleId", getRoleId())
- .toString();
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/vo/MetaVo.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/vo/MetaVo.java
deleted file mode 100644
index 118d2fa4..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/vo/MetaVo.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.ruoyi.project.system.domain.vo;
-
-/**
- * 璺敱鏄剧ず淇℃伅
- *
- * @author ruoyi
- */
-public class MetaVo
-{
- /**
- * 璁剧疆璇ヨ矾鐢卞湪渚ц竟鏍忓拰闈㈠寘灞戜腑灞曠ず鐨勫悕瀛
- */
- private String title;
-
- /**
- * 璁剧疆璇ヨ矾鐢辩殑鍥炬爣锛屽搴旇矾寰剆rc/icons/svg
- */
- private String icon;
-
- public MetaVo()
- {
- }
-
- public MetaVo(String title, String icon)
- {
- this.title = title;
- this.icon = icon;
- }
-
- public String getTitle()
- {
- return title;
- }
-
- public void setTitle(String title)
- {
- this.title = title;
- }
-
- public String getIcon()
- {
- return icon;
- }
-
- public void setIcon(String icon)
- {
- this.icon = icon;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/vo/RouterVo.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/vo/RouterVo.java
deleted file mode 100644
index 2177a7e7..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/vo/RouterVo.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.ruoyi.project.system.domain.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import java.util.List;
-
-/**
- * 璺敱閰嶇疆淇℃伅
- *
- * @author ruoyi
- */
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class RouterVo
-{
- /**
- * 璺敱鍚嶅瓧
- */
- private String name;
-
- /**
- * 璺敱鍦板潃
- */
- private String path;
-
- /**
- * 鏄惁闅愯棌璺敱锛屽綋璁剧疆 true 鐨勬椂鍊欒璺敱涓嶄細鍐嶄晶杈规爮鍑虹幇
- */
- private String hidden;
-
- /**
- * 閲嶅畾鍚戝湴鍧锛屽綋璁剧疆 noRedirect 鐨勬椂鍊欒璺敱鍦ㄩ潰鍖呭睉瀵艰埅涓笉鍙鐐瑰嚮
- */
- private String redirect;
-
- /**
- * 缁勪欢鍦板潃
- */
- private String component;
-
- /**
- * 褰撲綘涓涓矾鐢变笅闈㈢殑 children 澹版槑鐨勮矾鐢卞ぇ浜1涓椂锛岃嚜鍔ㄤ細鍙樻垚宓屽鐨勬ā寮--濡傜粍浠堕〉闈
- */
- private Boolean alwaysShow;
-
- /**
- * 鍏朵粬鍏冪礌
- */
- private MetaVo meta;
-
- /**
- * 瀛愯矾鐢
- */
- private List children;
-
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- public String getPath()
- {
- return path;
- }
-
- public void setPath(String path)
- {
- this.path = path;
- }
-
- public String getHidden()
- {
- return hidden;
- }
-
- public void setHidden(String hidden)
- {
- this.hidden = hidden;
- }
-
- public String getRedirect()
- {
- return redirect;
- }
-
- public void setRedirect(String redirect)
- {
- this.redirect = redirect;
- }
-
- public String getComponent()
- {
- return component;
- }
-
- public void setComponent(String component)
- {
- this.component = component;
- }
-
- public Boolean getAlwaysShow()
- {
- return alwaysShow;
- }
-
- public void setAlwaysShow(Boolean alwaysShow)
- {
- this.alwaysShow = alwaysShow;
- }
-
- public MetaVo getMeta()
- {
- return meta;
- }
-
- public void setMeta(MetaVo meta)
- {
- this.meta = meta;
- }
-
- public List getChildren()
- {
- return children;
- }
-
- public void setChildren(List children)
- {
- this.children = children;
- }
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysConfigMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysConfigMapper.java
deleted file mode 100644
index eea48d60..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysConfigMapper.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.ruoyi.project.system.mapper;
-
-import java.util.List;
-import com.ruoyi.project.system.domain.SysConfig;
-
-/**
- * 鍙傛暟閰嶇疆 鏁版嵁灞
- *
- * @author ruoyi
- */
-public interface SysConfigMapper
-{
- /**
- * 鏌ヨ鍙傛暟閰嶇疆淇℃伅
- *
- * @param config 鍙傛暟閰嶇疆淇℃伅
- * @return 鍙傛暟閰嶇疆淇℃伅
- */
- public SysConfig selectConfig(SysConfig config);
-
- /**
- * 鏌ヨ鍙傛暟閰嶇疆鍒楄〃
- *
- * @param config 鍙傛暟閰嶇疆淇℃伅
- * @return 鍙傛暟閰嶇疆闆嗗悎
- */
- public List selectConfigList(SysConfig config);
-
- /**
- * 鏍规嵁閿悕鏌ヨ鍙傛暟閰嶇疆淇℃伅
- *
- * @param configKey 鍙傛暟閿悕
- * @return 鍙傛暟閰嶇疆淇℃伅
- */
- public SysConfig checkConfigKeyUnique(String configKey);
-
- /**
- * 鏂板鍙傛暟閰嶇疆
- *
- * @param config 鍙傛暟閰嶇疆淇℃伅
- * @return 缁撴灉
- */
- public int insertConfig(SysConfig config);
-
- /**
- * 淇敼鍙傛暟閰嶇疆
- *
- * @param config 鍙傛暟閰嶇疆淇℃伅
- * @return 缁撴灉
- */
- public int updateConfig(SysConfig config);
-
- /**
- * 鍒犻櫎鍙傛暟閰嶇疆
- *
- * @param configId 鍙傛暟ID
- * @return 缁撴灉
- */
- public int deleteConfigById(Long configId);
-
- /**
- * 鎵归噺鍒犻櫎鍙傛暟淇℃伅
- *
- * @param configIds 闇瑕佸垹闄ょ殑鍙傛暟ID
- * @return 缁撴灉
- */
- public int deleteConfigByIds(Long[] configIds);
-}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java
deleted file mode 100644
index 7dac0cb4..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.ruoyi.project.system.mapper;
-
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import com.ruoyi.project.system.domain.SysDept;
-
-/**
- * 閮ㄩ棬绠＄悊 鏁版嵁灞
- *
- * @author ruoyi
- */
-public interface SysDeptMapper
-{
- /**
- * 鏌ヨ閮ㄩ棬绠＄悊鏁版嵁
- *
- * @param dept 閮ㄩ棬淇℃伅
- * @return 閮ㄩ棬淇℃伅闆嗗悎
- */
- public List selectDeptList(SysDept dept);
-
- /**
- * 鏍规嵁瑙掕壊ID鏌ヨ閮ㄩ棬鏍戜俊鎭
- *
- * @param roleId 瑙掕壊ID
- * @return 閫変腑閮ㄩ棬鍒楄〃
- */
- public List selectDeptListByRoleId(Long roleId);
-
- /**
- * 鏍规嵁閮ㄩ棬ID鏌ヨ淇℃伅
- *
- * @param deptId 閮ㄩ棬ID
- * @return 閮ㄩ棬淇℃伅
- */
- public SysDept selectDeptById(Long deptId);
-
- /**
- * 鏍规嵁ID鏌ヨ鎵鏈夊瓙閮ㄩ棬
- *
- * @param deptId 閮ㄩ棬ID
- * @return 閮ㄩ棬鍒楄〃
- */
- public List selectChildrenDeptById(Long deptId);
-
- /**
- * 鏄惁瀛樺湪瀛愯妭鐐
- *
- * @param deptId 閮ㄩ棬ID
- * @return 缁撴灉
- */
- public int hasChildByDeptId(Long deptId);
-
- /**
- * 鏌ヨ閮ㄩ棬鏄惁瀛樺湪鐢ㄦ埛
- *
- * @param deptId 閮ㄩ棬ID
- * @return 缁撴灉
- */
- public int checkDeptExistUser(Long deptId);
-
- /**
- * 鏍￠獙閮ㄩ棬鍚嶇О鏄惁鍞竴
- *
- * @param deptName 閮ㄩ棬鍚嶇О
- * @param parentId 鐖堕儴闂↖D
- * @return 缁撴灉
- */
- public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId);
-
- /**
- * 鏂板閮ㄩ棬淇℃伅
- *
- * @param dept 閮ㄩ棬淇℃伅
- * @return 缁撴灉
- */
- public int insertDept(SysDept dept);
-
- /**
- * 淇敼閮ㄩ棬淇℃伅
- *
- * @param dept 閮ㄩ棬淇℃伅
- * @return 缁撴灉
- */
- public int updateDept(SysDept dept);
-
- /**
- * 淇敼鎵鍦ㄩ儴闂ㄧ殑鐖剁骇閮ㄩ棬鐘舵
- *
- * @param dept 閮ㄩ棬
- */
- public void updateDeptStatus(SysDept dept);
-
- /**
- * 淇敼瀛愬厓绱犲叧绯
- *
- * @param depts 瀛愬厓绱
- * @return 缁撴灉
- */
- public int updateDeptChildren(@Param("depts") List depts);
-
- /**
- * 鍒犻櫎閮ㄩ棬绠＄悊淇℃伅
- *
- * @param deptId 閮ㄩ棬ID
- * @return 缁撴灉
- */
- public int deleteDeptById(Long deptId);
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDictDataMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDictDataMapper.java
deleted file mode 100644
index c938d884..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDictDataMapper.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.ruoyi.project.system.mapper;
-
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import com.ruoyi.project.system.domain.SysDictData;
-
-/**
- * 瀛楀吀琛 鏁版嵁灞
- *
- * @author ruoyi
- */
-public interface SysDictDataMapper
-{
- /**
- * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瀛楀吀鏁版嵁
- *
- * @param dictData 瀛楀吀鏁版嵁淇℃伅
- * @return 瀛楀吀鏁版嵁闆嗗悎淇℃伅
- */
- public List selectDictDataList(SysDictData dictData);
-
- /**
- * 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁
- *
- * @param dictType 瀛楀吀绫诲瀷
- * @return 瀛楀吀鏁版嵁闆嗗悎淇℃伅
- */
- public List selectDictDataByType(String dictType);
-
- /**
- * 鏍规嵁瀛楀吀绫诲瀷鍜屽瓧鍏搁敭鍊兼煡璇㈠瓧鍏告暟鎹俊鎭
- *
- * @param dictType 瀛楀吀绫诲瀷
- * @param dictValue 瀛楀吀閿
- * @return 瀛楀吀鏍囩
- */
- public String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue);
-
- /**
- * 鏍规嵁瀛楀吀鏁版嵁ID鏌ヨ淇℃伅
- *
- * @param dictCode 瀛楀吀鏁版嵁ID
- * @return 瀛楀吀鏁版嵁
- */
- public SysDictData selectDictDataById(Long dictCode);
-
- /**
- * 鏌ヨ瀛楀吀鏁版嵁
- *
- * @param dictType 瀛楀吀绫诲瀷
- * @return 瀛楀吀鏁版嵁
- */
- public int countDictDataByType(String dictType);
-
- /**
- * 閫氳繃瀛楀吀ID鍒犻櫎瀛楀吀鏁版嵁淇℃伅
- *
- * @param dictCode 瀛楀吀鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteDictDataById(Long dictCode);
-
- /**
- * 鎵归噺鍒犻櫎瀛楀吀鏁版嵁淇℃伅
- *
- * @param dictCodes 闇瑕佸垹闄ょ殑瀛楀吀鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteDictDataByIds(Long[] dictCodes);
-
- /**
- * 鏂板瀛楀吀鏁版嵁淇℃伅
- *
- * @param dictData 瀛楀吀鏁版嵁淇℃伅
- * @return 缁撴灉
- */
- public int insertDictData(SysDictData dictData);
-
- /**
- * 淇敼瀛楀吀鏁版嵁淇℃伅
- *
- * @param dictData 瀛楀吀鏁版嵁淇℃伅
- * @return 缁撴灉
- */
- public int updateDictData(SysDictData dictData);
-
- /**
- * 鍚屾淇敼瀛楀吀绫诲瀷
- *
- * @param oldDictType 鏃у瓧鍏哥被鍨
- * @param newDictType 鏂版棫瀛楀吀绫诲瀷
- * @return 缁撴灉
- */
- public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType);
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDictTypeMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDictTypeMapper.java
deleted file mode 100644
index 8a71574f..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDictTypeMapper.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.ruoyi.project.system.mapper;
-
-import java.util.List;
-import org.apache.ibatis.annotations.Mapper;
-import com.ruoyi.project.system.domain.SysDictType;
-
-/**
- * 瀛楀吀琛 鏁版嵁灞
- *
- * @author ruoyi
- */
-@Mapper
-public interface SysDictTypeMapper
-{
- /**
- * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瀛楀吀绫诲瀷
- *
- * @param dictType 瀛楀吀绫诲瀷淇℃伅
- * @return 瀛楀吀绫诲瀷闆嗗悎淇℃伅
- */
- public List selectDictTypeList(SysDictType dictType);
-
- /**
- * 鏍规嵁鎵鏈夊瓧鍏哥被鍨
- *
- * @return 瀛楀吀绫诲瀷闆嗗悎淇℃伅
- */
- public List selectDictTypeAll();
-
- /**
- * 鏍规嵁瀛楀吀绫诲瀷ID鏌ヨ淇℃伅
- *
- * @param dictId 瀛楀吀绫诲瀷ID
- * @return 瀛楀吀绫诲瀷
- */
- public SysDictType selectDictTypeById(Long dictId);
-
- /**
- * 鏍规嵁瀛楀吀绫诲瀷鏌ヨ淇℃伅
- *
- * @param dictType 瀛楀吀绫诲瀷
- * @return 瀛楀吀绫诲瀷
- */
- public SysDictType selectDictTypeByType(String dictType);
-
- /**
- * 閫氳繃瀛楀吀ID鍒犻櫎瀛楀吀淇℃伅
- *
- * @param dictId 瀛楀吀ID
- * @return 缁撴灉
- */
- public int deleteDictTypeById(Long dictId);
-
- /**
- * 鎵归噺鍒犻櫎瀛楀吀绫诲瀷淇℃伅
- *
- * @param dictIds 闇瑕佸垹闄ょ殑瀛楀吀ID
- * @return 缁撴灉
- */
- public int deleteDictTypeByIds(Long[] dictIds);
-
- /**
- * 鏂板瀛楀吀绫诲瀷淇℃伅
- *
- * @param dictType 瀛楀吀绫诲瀷淇℃伅
- * @return 缁撴灉
- */
- public int insertDictType(SysDictType dictType);
-
- /**
- * 淇敼瀛楀吀绫诲瀷淇℃伅
- *
- * @param dictType 瀛楀吀绫诲瀷淇℃伅
- * @return 缁撴灉
- */
- public int updateDictType(SysDictType dictType);
-
- /**
- * 鏍￠獙瀛楀吀绫诲瀷绉版槸鍚﹀敮涓
- *
- * @param dictType 瀛楀吀绫诲瀷
- * @return 缁撴灉
- */
- public SysDictType checkDictTypeUnique(String dictType);
-}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysMenuMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysMenuMapper.java
deleted file mode 100644
index fc460852..00000000
--- a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysMenuMapper.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.ruoyi.project.system.mapper;
-
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import com.ruoyi.project.system.domain.SysMenu;
-
-/**
- * 鑿滃崟琛 鏁版嵁灞
- *
- * @author ruoyi
- */
-public interface SysMenuMapper
-{
- /**
- * 鏌ヨ绯荤粺鑿滃崟鍒楄〃
- *
- * @param menu 鑿滃崟淇℃伅
- * @return 鑿滃崟鍒楄〃
- */
- public List selectMenuList(SysMenu menu);
-
- /**
- * 鏍规嵁鐢ㄦ埛鎵鏈夋潈闄
- *
- * @return 鏉冮檺鍒楄〃
- */
- public List selectMenuPerms();
-
- /**
- * 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃
- *
- * @param menu 鑿滃崟淇℃伅
- * @return 鑿滃崟鍒楄〃
- */
- public List selectMenuListByUserId(SysMenu menu);
-
- /**
- * 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺
- *
- * @param userId 鐢ㄦ埛ID
- * @return 鏉冮檺鍒楄〃
- */
- public List selectMenuPermsByUserId(Long userId);
-
- /**
- * 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟
- *
- * @return 鑿滃崟鍒楄〃
- */
- public List selectMenuTreeAll();
-
- /**
- * 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟
- *
- * @param username 鐢ㄦ埛ID
- * @return 鑿滃崟鍒楄〃
- */
- public List selectMenuTreeByUserId(Long userId);
-
- /**
- * 鏍规嵁瑙掕壊ID鏌ヨ鑿滃崟鏍戜俊鎭
- *
- * @param roleId 瑙掕壊ID
- * @return 閫変腑鑿滃崟鍒楄〃
- */
- public List