diff --git a/mycateye-agent/pom.xml b/mycateye-agent/pom.xml index c166212572c94b980282b2be78f226daa01ee176..4648aab6032bf66ff9c91ffad5affa2ba915c29b 100644 --- a/mycateye-agent/pom.xml +++ b/mycateye-agent/pom.xml @@ -18,6 +18,12 @@ + + io.mycat.eye + mycateye-common + 1.0-SNAPSHOT + + org.springframework.boot spring-boot-starter-web diff --git a/mycateye-agent/src/main/java/io/mycat/eye/agent/service/impl/DashboardServiceImpl.java b/mycateye-agent/src/main/java/io/mycat/eye/agent/service/impl/DashboardServiceImpl.java index e3b2a1a9d22302a277e3df5dc65334123c5645a9..c33e4be2b47d75679fa4be9eef7d8dc52a35da82 100644 --- a/mycateye-agent/src/main/java/io/mycat/eye/agent/service/impl/DashboardServiceImpl.java +++ b/mycateye-agent/src/main/java/io/mycat/eye/agent/service/impl/DashboardServiceImpl.java @@ -10,28 +10,22 @@ */ package io.mycat.eye.agent.service.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import io.mycat.eye.agent.bean.Constant; import io.mycat.eye.agent.bean.MysqlStatusHistory; import io.mycat.eye.agent.bean.MysqlStatusHistoryExample; -import io.mycat.eye.agent.dto.ChartDataDto; -import io.mycat.eye.agent.dto.DashboardOverview; -import io.mycat.eye.agent.dto.PagedDto; -import io.mycat.eye.agent.dto.Processlist; -import io.mycat.eye.agent.dto.QueryResult; +import io.mycat.eye.agent.dto.*; import io.mycat.eye.agent.mapper.MysqlServerMapper; import io.mycat.eye.agent.mapper.MysqlStatusHistoryMapper; import io.mycat.eye.agent.service.DashboardService; -import io.mycat.eye.agent.util.MiscUtil; import io.mycat.eye.agent.util.SysSampleUtil; +import io.mycat.eye.common.util.MiscUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; /** * @ClassName: DashboardServiceImpl diff --git a/mycateye-agent/src/main/java/io/mycat/eye/agent/service/impl/MysqlServiceImpl.java b/mycateye-agent/src/main/java/io/mycat/eye/agent/service/impl/MysqlServiceImpl.java index 281bb74e020aad15e1dfecef61fa7defcb4aa2b7..5c518c8924faec1cff057fdfc1496bc63cb7bbcc 100644 --- a/mycateye-agent/src/main/java/io/mycat/eye/agent/service/impl/MysqlServiceImpl.java +++ b/mycateye-agent/src/main/java/io/mycat/eye/agent/service/impl/MysqlServiceImpl.java @@ -10,31 +10,22 @@ */ package io.mycat.eye.agent.service.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import io.mycat.eye.agent.bean.Constant; import io.mycat.eye.agent.bean.MysqlCluster; import io.mycat.eye.agent.bean.MysqlServer; import io.mycat.eye.agent.bean.MysqlServerExample; -import io.mycat.eye.agent.dto.MasterInfoDto; -import io.mycat.eye.agent.dto.MysqlNodeDto; -import io.mycat.eye.agent.dto.MysqlOverview; -import io.mycat.eye.agent.dto.PagedDto; -import io.mycat.eye.agent.dto.QueryResult; -import io.mycat.eye.agent.dto.RestResponse; -import io.mycat.eye.agent.dto.SlaveInfoDto; -import io.mycat.eye.agent.dto.UserPriv; +import io.mycat.eye.agent.dto.*; import io.mycat.eye.agent.mapper.MysqlClusterMapper; import io.mycat.eye.agent.service.JdbcService; import io.mycat.eye.agent.service.MysqlService; -import io.mycat.eye.agent.util.MiscUtil; +import io.mycat.eye.common.util.MiscUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; /** * @ClassName: MysqlServiceImpl diff --git a/mycateye-agent/src/main/java/io/mycat/eye/agent/service/impl/SysUserServiceImpl.java b/mycateye-agent/src/main/java/io/mycat/eye/agent/service/impl/SysUserServiceImpl.java index 7d95869806b12b22590d9255636635958948f69a..4f249b70e2da151f03fba5283d675bde6c6fce2b 100644 --- a/mycateye-agent/src/main/java/io/mycat/eye/agent/service/impl/SysUserServiceImpl.java +++ b/mycateye-agent/src/main/java/io/mycat/eye/agent/service/impl/SysUserServiceImpl.java @@ -10,12 +10,6 @@ */ package io.mycat.eye.agent.service.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import io.mycat.eye.agent.bean.Constant; import io.mycat.eye.agent.bean.SysUser; import io.mycat.eye.agent.bean.SysUserExample; @@ -23,7 +17,11 @@ import io.mycat.eye.agent.bean.SysUserExample.Criteria; import io.mycat.eye.agent.dto.RestResponse; import io.mycat.eye.agent.mapper.SysUserMapper; import io.mycat.eye.agent.service.SysUserService; -import io.mycat.eye.agent.util.Md5Util; +import io.mycat.eye.common.util.Md5Util; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; /** * @ClassName: LoginServiceImpl diff --git a/mycateye-agent/src/main/java/io/mycat/eye/agent/util/Md5Util.java b/mycateye-agent/src/main/java/io/mycat/eye/agent/util/Md5Util.java deleted file mode 100644 index 76b409b23f3af7ff65e17019015764ecec28593a..0000000000000000000000000000000000000000 --- a/mycateye-agent/src/main/java/io/mycat/eye/agent/util/Md5Util.java +++ /dev/null @@ -1,53 +0,0 @@ -/** - * All rights Reserved, Designed By www.openwork.org.cn - * @Title: Md5Util.java - * @Package cn.bqjr.mysqleye.util - * @Description: TODO - * @author: 李平(360841519@qq.com) - * @date: 2017年3月22日 下午4:44:00 - * @version V1.0 - * @Copyright: 2017 www.openwork.org.cn Inc. All rights reserved. - */ -package io.mycat.eye.agent.util; - -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; - -/** - * @ClassName: Md5Util - * @Description:TODO - * @author: 李平(360841519@qq.com) - * @date: 2017年3月22日 下午4:44:00 - * - * @Copyright: 2017 www.openwork.org.cn Inc. All rights reserved. - */ -public class Md5Util { - // 静态方法，便于作为工具类 - public static String getMd5(String plainText) { - try { - MessageDigest md = MessageDigest.getInstance("MD5"); - md.update(plainText.getBytes()); - byte b[] = md.digest(); - - int i; - - StringBuffer buf = new StringBuffer(""); - for (int offset = 0; offset < b.length; offset++) { - i = b[offset]; - if (i < 0) - i += 256; - if (i < 16) - buf.append("0"); - buf.append(Integer.toHexString(i)); - } - // 32位加密 - return buf.toString(); - // 16位的加密 - // return buf.toString().substring(8, 24); - } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); - return null; - } - - } -} diff --git a/mycateye-agent/src/main/java/io/mycat/eye/agent/util/MiscUtil.java b/mycateye-agent/src/main/java/io/mycat/eye/agent/util/MiscUtil.java deleted file mode 100644 index af0e6b58507a4919aaa96e27da69a3b58685d0ee..0000000000000000000000000000000000000000 --- a/mycateye-agent/src/main/java/io/mycat/eye/agent/util/MiscUtil.java +++ /dev/null @@ -1,159 +0,0 @@ -/** - * All rights Reserved, Designed By www.openwork.org.cn - * @Title: MiscUtil.java - * @Package cn.org.openwork.nosql.util - * @Description: 常用工具类 - * @author: 李平(360841519@qq.com) - * @date: 2017年7月21日 下午2:53:20 - * @version V1.0 - * @Copyright: 2017 www.openwork.org.cn Inc. All rights reserved. - */ -package io.mycat.eye.agent.util; - -import java.math.BigDecimal; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; - -/** - * @ClassName: MiscUtil - * @Description:常用工具类 - * @author: 李平(360841519@qq.com) - * @date: 2017年7月21日 下午2:53:20 - * - * @Copyright: 2017 www.openwork.org.cn Inc. All rights reserved. - */ -public class MiscUtil -{ - /** - * 字节数转换为MB格式 - * @Title: bytesToMb - * @param bytes - * @return - * @throws - */ - public static String bytesToMb(String bytes) - { - BigDecimal bytesBigDecimal = new BigDecimal(bytes); - BigDecimal mbBigDecimal = bytesBigDecimal.divide(new BigDecimal(1024 * 1024), 1, BigDecimal.ROUND_HALF_UP); - return mbBigDecimal.toString(); - } - - /** - * 将秒数转换为已读的时间格式 - * @Title: secondsToHumanTime - * @param sec - * @return - * @throws - */ - public static String secondsToHumanTime(long sec) - { - long mss = sec * 1000; - long days = mss / (1000 * 60 * 60 * 24); - long hours = (mss % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60); - long minutes = (mss % (1000 * 60 * 60)) / (1000 * 60); - long seconds = (mss % (1000 * 60)) / 1000; - return days + "天" + hours + "小时" + minutes + "分钟" + seconds + "秒"; - } - /** - * 根据偏移量获取时间 - * @Title: getDateTimeByOffsetHours - * @param addHours - * @return - * @throws - */ - public static Date getDateTimeByOffsetHours(int addHours) - { - java.util.Calendar cal = java.util.Calendar.getInstance(); - int zoneOffset = cal.get(java.util.Calendar.ZONE_OFFSET); - int dstOffset = cal.get(java.util.Calendar.DST_OFFSET); - cal.add(java.util.Calendar.MILLISECOND, -(zoneOffset + dstOffset)); - cal.add(Calendar.HOUR_OF_DAY, addHours); - Date date = cal.getTime(); - return date; - } - - /** - * 格式化时间 - * @Title: getDateTimeByFormat - * @param date - * @return - * @throws - */ - public static String getFormatDateTime(Date date){ - return new SimpleDateFormat("MM-dd HH:mm:ss").format(date); - } - - /** - * 字节转KB MB GB - * @Title: getHumanSize - * @param size - * @return - * @throws - */ - public static String getHumanSizeByBytes(long size) - { - //如果字节数少于1024，则直接以B为单位，否则先除于1024，后3位因太少无意义 - if (size < 1024) - { - return String.valueOf(size) + "B"; - } - else - { - size = size / 1024; - } - //如果原字节数除于1024之后，少于1024，则可以直接以KB作为单位 - //因为还没有到达要使用另一个单位的时候 - //接下去以此类推 - if (size < 1024) - { - return String.valueOf(size) + "KB"; - } - else - { - size = size / 1024; - } - if (size < 1024) - { - //因为如果以MB为单位的话，要保留最后1位小数， - //因此，把此数乘以100之后再取余 - size = size * 100; - return String.valueOf((size / 100)) + "." + String.valueOf((size % 100)) + "MB"; - } - else - { - //否则如果要以GB为单位的，先除于1024再作同样的处理 - size = size * 100 / 1024; - return String.valueOf((size / 100)) + "." + String.valueOf((size % 100)) + "GB"; - } - } - /** - * 秒转为易读的时间 - * @Title: getHumanTimeBySeconds - * @param sec - * @return - * @throws - */ - public static String getHumanTimeBySeconds(long sec) - { - long mss = sec * 1000; - long days = mss / (1000 * 60 * 60 * 24); - long hours = (mss % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60); - long minutes = (mss % (1000 * 60 * 60)) / (1000 * 60); - long seconds = (mss % (1000 * 60)) / 1000; - return days + "天" + hours + "小时" + minutes + "分钟" + seconds + "秒"; - } - /** - * 获取两数相除的百分比 - * @Title: getPercentage - * @param a - * @param b - * @return - * @throws - */ - public static String getPercentage(Long a,Long b){ - BigDecimal divide = new BigDecimal(a).divide(new BigDecimal(b), 1, BigDecimal.ROUND_HALF_UP); - BigDecimal percentage=divide.multiply(new BigDecimal(100)).setScale(1, BigDecimal.ROUND_HALF_UP); - return percentage + "%"; - } -} diff --git a/mycateye-common/pom.xml b/mycateye-common/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..30a35428db56a51d98d256963552692463e92f74 --- /dev/null +++ b/mycateye-common/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + mycateye-common + 1.0-SNAPSHOT + + + io.mycat.eye + Mycat-Eye + 0.8 + ../pom.xml + + + diff --git a/mycateye-common/src/main/java/io/mycat/eye/common/util/Md5Util.java b/mycateye-common/src/main/java/io/mycat/eye/common/util/Md5Util.java new file mode 100644 index 0000000000000000000000000000000000000000..0f43a51c0eed68ee552735d7ecb6c8dbbcadce8b --- /dev/null +++ b/mycateye-common/src/main/java/io/mycat/eye/common/util/Md5Util.java @@ -0,0 +1,53 @@ +/** + * All rights Reserved, Designed By www.openwork.org.cn + * + * @Title: Md5Util.java + * @Package cn.bqjr.mysqleye.util + * @Description: TODO + * @author: 李平(360841519 @ qq.com) + * @date: 2017年3月22日 下午4:44:00 + * @version V1.0 + * @Copyright: 2017 www.openwork.org.cn Inc. All rights reserved. + */ +package io.mycat.eye.common.util; + +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + +/** + * @ClassName: Md5Util + * @Description:TODO + * @author: 李平(360841519 @ qq.com) + * @date: 2017年3月22日 下午4:44:00 + * @Copyright: 2017 www.openwork.org.cn Inc. All rights reserved. + */ +public class Md5Util { + // 静态方法，便于作为工具类 + public static String getMd5(String plainText) { + try { + MessageDigest md = MessageDigest.getInstance("MD5"); + md.update(plainText.getBytes()); + byte b[] = md.digest(); + + int i; + + StringBuffer buf = new StringBuffer(""); + for (int offset = 0; offset < b.length; offset++) { + i = b[offset]; + if (i < 0) + i += 256; + if (i < 16) + buf.append("0"); + buf.append(Integer.toHexString(i)); + } + // 32位加密 + return buf.toString(); + // 16位的加密 + // return buf.toString().substring(8, 24); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + return null; + } + + } +} diff --git a/mycateye-web/src/main/java/io/mycat/eye/web/util/MiscUtil.java b/mycateye-common/src/main/java/io/mycat/eye/common/util/MiscUtil.java similarity index 69% rename from mycateye-web/src/main/java/io/mycat/eye/web/util/MiscUtil.java rename to mycateye-common/src/main/java/io/mycat/eye/common/util/MiscUtil.java index 9c11b46039b50b319d1ad7df940155409cf7ba6e..2434e22322c2f45b1e9377258c6909cf6b95027a 100644 --- a/mycateye-web/src/main/java/io/mycat/eye/web/util/MiscUtil.java +++ b/mycateye-common/src/main/java/io/mycat/eye/common/util/MiscUtil.java @@ -1,179 +1,153 @@ -/** - * All rights Reserved, Designed By www.openwork.org.cn - * - * @Title: MiscUtil.java - * @Package cn.org.openwork.nosql.util - * @Description: 常用工具类 - * @author: 李平(360841519 @ qq.com) - * @date: 2017年7月21日 下午2:53:20 - * @version V1.0 - * @Copyright: 2017 www.openwork.org.cn Inc. All rights reserved. - */ -package io.mycat.eye.web.util; - -import java.math.BigDecimal; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -/** - * @ClassName: MiscUtil - * @Description:常用工具类 - * @author: 李平(360841519 @ qq.com) - * @date: 2017年7月21日 下午2:53:20 - * @Copyright: 2017 www.openwork.org.cn Inc. All rights reserved. - */ -public class MiscUtil { - /** - * 字节数转换为MB格式 - * - * @param bytes - * @return - * @throws - * @Title: bytesToMb - */ - public static String bytesToMb(String bytes) { - BigDecimal bytesBigDecimal = new BigDecimal(bytes); - BigDecimal mbBigDecimal = bytesBigDecimal.divide(new BigDecimal(1024 * 1024), 1, BigDecimal.ROUND_HALF_UP); - return mbBigDecimal.toString(); - } - - /** - * 将秒数转换为已读的时间格式 - * - * @param sec - * @return - * @throws - * @Title: secondsToHumanTime - */ - public static String secondsToHumanTime(long sec) { - long mss = sec * 1000; - long days = mss / (1000 * 60 * 60 * 24); - long hours = (mss % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60); - long minutes = (mss % (1000 * 60 * 60)) / (1000 * 60); - long seconds = (mss % (1000 * 60)) / 1000; - return days + "天" + hours + "小时" + minutes + "分钟" + seconds + "秒"; - } - - /** - * 根据偏移量获取时间 - * - * @param addHours - * @return - * @throws - * @Title: getDateTimeByOffsetHours - */ - public static Date getDateTimeByOffsetHours(int addHours) { - java.util.Calendar cal = java.util.Calendar.getInstance(); - int zoneOffset = cal.get(java.util.Calendar.ZONE_OFFSET); - int dstOffset = cal.get(java.util.Calendar.DST_OFFSET); - cal.add(java.util.Calendar.MILLISECOND, -(zoneOffset + dstOffset)); - cal.add(Calendar.HOUR_OF_DAY, addHours); - Date date = cal.getTime(); - return date; - } - - /** - * 格式化时间 - * - * @param date - * @return - * @throws - * @Title: getDateTimeByFormat - */ - public static String getFormatDateTime(Date date) { - return new SimpleDateFormat("MM-dd HH:mm:ss").format(date); - } - - /** - * 获取当前时间字符串 - * - * @return - * @throws - * @Title: getCurrentDateTimeStr - */ - public static String getCurrentDateTimeStr() { - return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - } - - /** - * 根据 - * - * @param hour - * @return - * @throws - * @Title: getDateTimeStrByHour - */ - public static String getDateTimeStrByOffsetHours(int hour) { - Calendar calendar = Calendar.getInstance(); - calendar.set(Calendar.HOUR_OF_DAY, calendar.get(Calendar.HOUR_OF_DAY) + hour); - return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(calendar.getTime()); - - } - - /** - * 字节转KB MB GB - * - * @param size - * @return - * @throws - * @Title: getHumanSize - */ - public static String getHumanSizeByBytes(long size) { - //如果字节数少于1024，则直接以B为单位，否则先除于1024，后3位因太少无意义 - if (size < 1024) { - return String.valueOf(size) + "B"; - } else { - size = size / 1024; - } - //如果原字节数除于1024之后，少于1024，则可以直接以KB作为单位 - //因为还没有到达要使用另一个单位的时候 - //接下去以此类推 - if (size < 1024) { - return String.valueOf(size) + "KB"; - } else { - size = size / 1024; - } - if (size < 1024) { - //因为如果以MB为单位的话，要保留最后1位小数， - //因此，把此数乘以100之后再取余 - size = size * 100; - return String.valueOf((size / 100)) + "." + String.valueOf((size % 100)) + "MB"; - } else { - //否则如果要以GB为单位的，先除于1024再作同样的处理 - size = size * 100 / 1024; - return String.valueOf((size / 100)) + "." + String.valueOf((size % 100)) + "GB"; - } - } - - /** - * 秒转为易读的时间 - * - * @param sec - * @return - * @throws - * @Title: getHumanTimeBySeconds - */ - public static String getHumanTimeBySeconds(long sec) { - long mss = sec * 1000; - long days = mss / (1000 * 60 * 60 * 24); - long hours = (mss % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60); - long minutes = (mss % (1000 * 60 * 60)) / (1000 * 60); - long seconds = (mss % (1000 * 60)) / 1000; - return days + "天" + hours + "小时" + minutes + "分钟" + seconds + "秒"; - } - - public static Map mapOf(String key, String value) { - HashMap map = new HashMap<>(); - map.put(key, value); - return map; - } - public static Map mapOf(String key, String value,String key2,String value2) { - HashMap map = new HashMap<>(2); - map.put(key, value); - map.put(key2,value2); - return map; - } -} +/** + * All rights Reserved, Designed By www.openwork.org.cn + * + * @Title: MiscUtil.java + * @Package cn.org.openwork.nosql.util + * @Description: 常用工具类 + * @author: 李平(360841519 @ qq.com) + * @date: 2017年7月21日 下午2:53:20 + * @version V1.0 + * @Copyright: 2017 www.openwork.org.cn Inc. All rights reserved. + */ +package io.mycat.eye.common.util; + +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * @ClassName: MiscUtil + * @Description:常用工具类 + * @author: 李平(360841519 @ qq.com) + * @date: 2017年7月21日 下午2:53:20 + * @Copyright: 2017 www.openwork.org.cn Inc. All rights reserved. + */ +public class MiscUtil { + /** + * 字节数转换为MB格式 + * + * @param bytes + * @return + * @throws + * @Title: bytesToMb + */ + public static String bytesToMb(String bytes) { + BigDecimal bytesBigDecimal = new BigDecimal(bytes); + BigDecimal mbBigDecimal = bytesBigDecimal.divide(new BigDecimal(1024 * 1024), 1, BigDecimal.ROUND_HALF_UP); + return mbBigDecimal.toString(); + } + + /** + * 根据偏移量获取时间 + * + * @param addHours + * @return + * @throws + * @Title: getDateTimeByOffsetHours + */ + public static Date getDateTimeByOffsetHours(int addHours) { + Calendar cal = Calendar.getInstance(); + int zoneOffset = cal.get(Calendar.ZONE_OFFSET); + int dstOffset = cal.get(Calendar.DST_OFFSET); + cal.add(Calendar.MILLISECOND, -(zoneOffset + dstOffset)); + cal.add(Calendar.HOUR_OF_DAY, addHours); + Date date = cal.getTime(); + return date; + } + + /** + * 格式化时间 + * + * @param date + * @return + * @throws + * @Title: getDateTimeByFormat + */ + public static String getFormatDateTime(Date date) { + return new SimpleDateFormat("MM-dd HH:mm:ss").format(date); + } + + /** + * 字节转KB MB GB + * + * @param size + * @return + * @throws + * @Title: getHumanSize + */ + public static String getHumanSizeByBytes(long size) { + //如果字节数少于1024，则直接以B为单位，否则先除于1024，后3位因太少无意义 + if (size < 1024) { + return String.valueOf(size) + "B"; + } else { + size = size / 1024; + } + //如果原字节数除于1024之后，少于1024，则可以直接以KB作为单位 + //因为还没有到达要使用另一个单位的时候 + //接下去以此类推 + if (size < 1024) { + return String.valueOf(size) + "KB"; + } else { + size = size / 1024; + } + if (size < 1024) { + //因为如果以MB为单位的话，要保留最后1位小数， + //因此，把此数乘以100之后再取余 + size = size * 100; + return String.valueOf((size / 100)) + "." + String.valueOf((size % 100)) + "MB"; + } else { + //否则如果要以GB为单位的，先除于1024再作同样的处理 + size = size * 100 / 1024; + return String.valueOf((size / 100)) + "." + String.valueOf((size % 100)) + "GB"; + } + } + + /** + * 秒转为易读的时间 + * + * @param sec + * @return + * @throws + * @Title: getHumanTimeBySeconds + */ + public static String getHumanTimeBySeconds(long sec) { + long mss = sec * 1000; + long days = mss / (1000 * 60 * 60 * 24); + long hours = (mss % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60); + long minutes = (mss % (1000 * 60 * 60)) / (1000 * 60); + long seconds = (mss % (1000 * 60)) / 1000; + return days + "天" + hours + "小时" + minutes + "分钟" + seconds + "秒"; + } + + /** + * 获取两数相除的百分比 + * + * @param a + * @param b + * @return + * @throws + * @Title: getPercentage + */ + public static String getPercentage(Long a, Long b) { + BigDecimal divide = new BigDecimal(a).divide(new BigDecimal(b), 1, BigDecimal.ROUND_HALF_UP); + BigDecimal percentage = divide.multiply(new BigDecimal(100)).setScale(1, BigDecimal.ROUND_HALF_UP); + return percentage + "%"; + } + + + public static Map mapOf(String key, String value) { + HashMap map = new HashMap<>(); + map.put(key, value); + return map; + } + + public static Map mapOf(String key, String value, String key2, String value2) { + HashMap map = new HashMap<>(2); + map.put(key, value); + map.put(key2, value2); + return map; + } +} diff --git a/mycateye-web/pom.xml b/mycateye-web/pom.xml index f70357f10c771e0a76a18fd70adcbcf3a221edcd..0716be700a084c39e5fe9150c75b6d51a1088850 100644 --- a/mycateye-web/pom.xml +++ b/mycateye-web/pom.xml @@ -18,6 +18,13 @@ + + + io.mycat.eye + mycateye-common + 1.0-SNAPSHOT + + org.springframework.boot spring-boot-starter-web diff --git a/mycateye-web/src/main/java/io/mycat/eye/web/service/impl/LoginServiceImpl.java b/mycateye-web/src/main/java/io/mycat/eye/web/service/impl/LoginServiceImpl.java index 0546bdabf4dfe493e141ec34254a4026d0bfc1b2..2e913c71e89ec935043be5cd7fa415a0928c6458 100644 --- a/mycateye-web/src/main/java/io/mycat/eye/web/service/impl/LoginServiceImpl.java +++ b/mycateye-web/src/main/java/io/mycat/eye/web/service/impl/LoginServiceImpl.java @@ -10,12 +10,7 @@ */ package io.mycat.eye.web.service.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - +import io.mycat.eye.common.util.Md5Util; import io.mycat.eye.web.bean.SysUser; import io.mycat.eye.web.bean.SysUserExample; import io.mycat.eye.web.bean.SysUserExample.Criteria; @@ -23,7 +18,10 @@ import io.mycat.eye.web.dto.RestResponse; import io.mycat.eye.web.mapper.SysUserMapper; import io.mycat.eye.web.service.LoginService; import io.mycat.eye.web.util.Constant; -import io.mycat.eye.web.util.Md5Util; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; /** * @ClassName: LoginServiceImpl diff --git a/mycateye-web/src/main/java/io/mycat/eye/web/service/impl/MysqlStatusHistoryServiceImpl.java b/mycateye-web/src/main/java/io/mycat/eye/web/service/impl/MysqlStatusHistoryServiceImpl.java index b327a4192cb7686a10deb1a53ad7795dc1c481d9..b295d20d7dec84202788329347d0f8f0d6c0d342 100644 --- a/mycateye-web/src/main/java/io/mycat/eye/web/service/impl/MysqlStatusHistoryServiceImpl.java +++ b/mycateye-web/src/main/java/io/mycat/eye/web/service/impl/MysqlStatusHistoryServiceImpl.java @@ -1,28 +1,22 @@ package io.mycat.eye.web.service.impl; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.annotation.CacheConfig; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSON; - +import io.mycat.eye.common.util.MiscUtil; import io.mycat.eye.web.bean.MysqlStatusHistory; import io.mycat.eye.web.bean.MysqlStatusHistoryExample; import io.mycat.eye.web.dto.ChatDataDto; import io.mycat.eye.web.dto.Status; import io.mycat.eye.web.mapper.MysqlStatusHistoryMapper; import io.mycat.eye.web.service.MysqlStatusHistoryService; -import io.mycat.eye.web.util.MiscUtil; import io.mycat.eye.web.util.SysSampleUtil; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.CacheConfig; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; + +import java.text.ParseException; +import java.util.*; @CacheConfig(cacheNames = "mysqlStatusHistoryCache") @Service diff --git a/mycateye-web/src/main/java/io/mycat/eye/web/service/impl/SysUserServiceImpl.java b/mycateye-web/src/main/java/io/mycat/eye/web/service/impl/SysUserServiceImpl.java index 823a62707249b20a56170535f04724b8be35da79..a98ea98cbb13b4a5c6701faa7a16f05933e20ada 100644 --- a/mycateye-web/src/main/java/io/mycat/eye/web/service/impl/SysUserServiceImpl.java +++ b/mycateye-web/src/main/java/io/mycat/eye/web/service/impl/SysUserServiceImpl.java @@ -1,20 +1,19 @@ package io.mycat.eye.web.service.impl; -import java.util.Date; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; - +import io.mycat.eye.common.util.Md5Util; import io.mycat.eye.web.bean.SysUser; import io.mycat.eye.web.bean.SysUserExample; import io.mycat.eye.web.exception.BusinessException; import io.mycat.eye.web.exception.sys.user.SysUserExceptionEnum; import io.mycat.eye.web.mapper.SysUserMapper; import io.mycat.eye.web.service.SysUserService; -import io.mycat.eye.web.util.Md5Util; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; + +import java.util.Date; +import java.util.List; /** * Created by BQ0082 on 2017/3/31. diff --git a/mycateye-web/src/main/java/io/mycat/eye/web/util/Md5Util.java b/mycateye-web/src/main/java/io/mycat/eye/web/util/Md5Util.java deleted file mode 100644 index 3aaab074ad01159f8496e5ac88f39f0a85bc118c..0000000000000000000000000000000000000000 --- a/mycateye-web/src/main/java/io/mycat/eye/web/util/Md5Util.java +++ /dev/null @@ -1,58 +0,0 @@ -/** - * All rights Reserved, Designed By www.mycat.io - * @Title: Md5Util.java - * @Package io.mycat.eye.web.util - * @Description: TODO - * @author: 李平(360841519@qq.com) - * @date: 2017年3月22日 下午4:44:00 - * @version V1.0 - * @Copyright: 2017 www.mycat.io Inc. All rights reserved. - */ -package io.mycat.eye.web.util; - -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; - -/** - * @ClassName: Md5Util - * @Description:MD5工具类 - * @author: 李平(360841519@qq.com) - * @date: 2017年3月22日 下午4:44:00 - * - * @Copyright: 2017 www.mycat.io Inc. All rights reserved. - */ -public class Md5Util { - // 静态方法，便于作为工具类 - public static String getMd5(String plainText) { - try { - MessageDigest md = MessageDigest.getInstance("MD5"); - md.update(plainText.getBytes()); - byte b[] = md.digest(); - - int i; - - StringBuffer buf = new StringBuffer(""); - for (int offset = 0; offset < b.length; offset++) { - i = b[offset]; - if (i < 0) - i += 256; - if (i < 16) - buf.append("0"); - buf.append(Integer.toHexString(i)); - } - // 32位加密 - return buf.toString(); - // 16位的加密 - // return buf.toString().substring(8, 24); - } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); - return null; - } - - } - - public static void main(String[] args) { - // 测试 - System.out.println(new Md5Util().getMd5("admin")); - } -} diff --git a/mycateye-web/src/main/java/io/mycat/eye/web/util/RestTemplateUtils.java b/mycateye-web/src/main/java/io/mycat/eye/web/util/RestTemplateUtils.java index 30deac2eb3977ff3d0fae207ffe847f61f85f254..2af34f39b4ce36aa15bad1027f73a6073528b870 100644 --- a/mycateye-web/src/main/java/io/mycat/eye/web/util/RestTemplateUtils.java +++ b/mycateye-web/src/main/java/io/mycat/eye/web/util/RestTemplateUtils.java @@ -1,5 +1,6 @@ package io.mycat.eye.web.util; +import io.mycat.eye.common.util.MiscUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/pom.xml b/pom.xml index 88a7928458c111979e31d08d22d1d3985dff90c0..0ee4cca8bcc5866656c4f4808feb635110a7b109 100644 --- a/pom.xml +++ b/pom.xml @@ -19,6 +19,7 @@ + mycateye-common mycateye-agent mycateye-web