From 1e578567b09b8861d0bb56091dc673114b310642 Mon Sep 17 00:00:00 2001 From: Xiong Neng Date: Sat, 15 Sep 2018 12:47:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90springboot-jwt=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- springboot-jwt/README.md | 27 +- springboot-jwt/pom.xml | 3 +- .../com/xncoding/jwt/api/LoginController.java | 33 +- .../xncoding/jwt/api/PublicController.java | 3 +- .../xncoding/jwt/api/model/LoginParam.java | 24 -- .../jwt/common/constant/ConstantsList.java | 37 --- .../xncoding/jwt/common/constant/DictMap.java | 80 ----- .../xncoding/jwt/common/util/CommonUtil.java | 41 --- .../xncoding/jwt/common/util/DateUtil.java | 296 ------------------ .../com/xncoding/jwt/common/util/JWTUtil.java | 161 ++-------- .../dao/entity => dao/domain}/Manager.java | 2 +- .../entity => dao/domain}/ManagerRole.java | 2 +- .../dao/entity => dao/domain}/Permission.java | 2 +- .../dao/entity => dao/domain}/Role.java | 2 +- .../entity => dao/domain}/RolePermission.java | 2 +- .../{dao/entity => model}/ManagerInfo.java | 9 +- .../jwt/{dao/entity => model}/SysRole.java | 6 +- .../jwt/service/ManagerInfoService.java | 12 +- .../com/xncoding/jwt/shiro/MyShiroRealm.java | 6 +- .../java/com/xncoding/jwt/shiro/ShiroKit.java | 2 - .../src/main/resources/application.yml | 17 +- .../com/xncoding/jwt/ApplicationTests.java | 15 - .../java/com/xncoding/jwt/SimpleTest.java | 15 +- .../jwt/common/util/CommonUtilTest.java | 24 -- .../src/test/resources/keystore.jks | Bin 1334 -> 0 bytes 25 files changed, 88 insertions(+), 733 deletions(-) delete mode 100644 springboot-jwt/src/main/java/com/xncoding/jwt/common/constant/ConstantsList.java delete mode 100644 springboot-jwt/src/main/java/com/xncoding/jwt/common/constant/DictMap.java delete mode 100644 springboot-jwt/src/main/java/com/xncoding/jwt/common/util/CommonUtil.java delete mode 100644 springboot-jwt/src/main/java/com/xncoding/jwt/common/util/DateUtil.java rename springboot-jwt/src/main/java/com/xncoding/jwt/{common/dao/entity => dao/domain}/Manager.java (98%) rename springboot-jwt/src/main/java/com/xncoding/jwt/{common/dao/entity => dao/domain}/ManagerRole.java (98%) rename springboot-jwt/src/main/java/com/xncoding/jwt/{common/dao/entity => dao/domain}/Permission.java (98%) rename springboot-jwt/src/main/java/com/xncoding/jwt/{common/dao/entity => dao/domain}/Role.java (98%) rename springboot-jwt/src/main/java/com/xncoding/jwt/{common/dao/entity => dao/domain}/RolePermission.java (98%) rename springboot-jwt/src/main/java/com/xncoding/jwt/{dao/entity => model}/ManagerInfo.java (86%) rename springboot-jwt/src/main/java/com/xncoding/jwt/{dao/entity => model}/SysRole.java (78%) delete mode 100644 springboot-jwt/src/test/java/com/xncoding/jwt/ApplicationTests.java delete mode 100644 springboot-jwt/src/test/java/com/xncoding/jwt/common/util/CommonUtilTest.java delete mode 100644 springboot-jwt/src/test/resources/keystore.jks diff --git a/springboot-jwt/README.md b/springboot-jwt/README.md index c03d345..74f5695 100644 --- a/springboot-jwt/README.md +++ b/springboot-jwt/README.md @@ -1,3 +1,9 @@ +# Table of Contents + + * [简介](#简介) + * [测试](#测试) + * [许可证](#许可证) + ## 简介 @@ -30,12 +36,21 @@ Content-Type: application/json ``` json { "username": "admin", - "password": "12345678", - "appid": "111", - "imei": "imei" + "password": "12345678" } ``` +可使用postman或者curl方式，本人更愿意使用curl方式： + +``` + curl -X POST http://localhost:9095/login -H 'Content-Type: application/json' -d ' +{ + "username": "admin", + "password": "12345678" +} +' +``` + 返回值： ``` json @@ -63,6 +78,12 @@ Content-Type: application/json Authorization: "上面拿到的token值" ``` +curl访问语法： + +``` +curl -X GET http://localhost:9095/api/v1/join?imei=imei -H 'Content-Type: application/json' -H 'Authorization: 上面拿到的token值' +``` + ## 许可证 Copyright (c) 2018 Xiong Neng diff --git a/springboot-jwt/pom.xml b/springboot-jwt/pom.xml index ac0ee33..a6b18ab 100644 --- a/springboot-jwt/pom.xml +++ b/springboot-jwt/pom.xml @@ -42,7 +42,7 @@ com.auth0 java-jwt - 3.3.0 + 3.4.0 org.springframework.boot @@ -85,6 +85,7 @@ commons-lang3 3.7 + diff --git a/springboot-jwt/src/main/java/com/xncoding/jwt/api/LoginController.java b/springboot-jwt/src/main/java/com/xncoding/jwt/api/LoginController.java index 6efa0ed..668f4fc 100644 --- a/springboot-jwt/src/main/java/com/xncoding/jwt/api/LoginController.java +++ b/springboot-jwt/src/main/java/com/xncoding/jwt/api/LoginController.java @@ -3,14 +3,12 @@ package com.xncoding.jwt.api; import com.xncoding.jwt.api.model.BaseResponse; import com.xncoding.jwt.api.model.LoginParam; import com.xncoding.jwt.common.util.JWTUtil; -import com.xncoding.jwt.dao.entity.ManagerInfo; +import com.xncoding.jwt.model.ManagerInfo; import com.xncoding.jwt.service.ManagerInfoService; import com.xncoding.jwt.shiro.ShiroKit; -import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.UnauthorizedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -32,41 +30,16 @@ public class LoginController { _logger.info("用户请求登录获取Token"); String username = loginParam.getUsername(); String password = loginParam.getPassword(); - String appid = loginParam.getAppid(); - String imei = loginParam.getImei(); ManagerInfo user = managerInfoService.findByUsername(username); - //盐（用户名+随机数） + //随机数盐 String salt = user.getSalt(); - //原密码 + //原密码加密（通过username + salt作为盐） String encodedPassword = ShiroKit.md5(password, username + salt); if (user.getPassword().equals(encodedPassword)) { - if (StringUtils.isNotEmpty(appid) && StringUtils.isNotEmpty(imei)) { - return new BaseResponse<>(true, "Login success", JWTUtil.signSocket(username, encodedPassword, appid, imei)); - } return new BaseResponse<>(true, "Login success", JWTUtil.sign(username, encodedPassword)); } else { throw new UnauthorizedException(); } } - @PostMapping("/notifyLogin") - public BaseResponse notifyLogin(@RequestHeader(name="Content-Type", defaultValue = "application/json") String contentType, - @RequestBody LoginParam loginParam) { - _logger.info("登录用户推送请求登录获取Token"); - String username = loginParam.getUsername(); - String password = loginParam.getPassword(); - ManagerInfo user = managerInfoService.findByUsername(username); - if (user.getPassword().equals(password)) { - return new BaseResponse<>(true, "Login success", JWTUtil.sign(username, password)); - } else { - throw new UnauthorizedException(); - } - } - - @GetMapping(path = "/401") - @ResponseStatus(HttpStatus.UNAUTHORIZED) - public BaseResponse unauthorized() { - return new BaseResponse<>(false, "Unauthorized", null); - } - } diff --git a/springboot-jwt/src/main/java/com/xncoding/jwt/api/PublicController.java b/springboot-jwt/src/main/java/com/xncoding/jwt/api/PublicController.java index 0e9b81e..a498d9a 100644 --- a/springboot-jwt/src/main/java/com/xncoding/jwt/api/PublicController.java +++ b/springboot-jwt/src/main/java/com/xncoding/jwt/api/PublicController.java @@ -22,8 +22,7 @@ public class PublicController { */ @RequestMapping(value = "/join", method = RequestMethod.GET) @RequiresAuthentication - public BaseResponse join(@RequestHeader("Authorization") String token, - @RequestParam("imei") String imei) { + public BaseResponse join(@RequestParam("imei") String imei) { _logger.info("入网查询接口 start... imei=" + imei); BaseResponse result = new BaseResponse(); result.setSuccess(true); diff --git a/springboot-jwt/src/main/java/com/xncoding/jwt/api/model/LoginParam.java b/springboot-jwt/src/main/java/com/xncoding/jwt/api/model/LoginParam.java index b11e836..6113bbc 100644 --- a/springboot-jwt/src/main/java/com/xncoding/jwt/api/model/LoginParam.java +++ b/springboot-jwt/src/main/java/com/xncoding/jwt/api/model/LoginParam.java @@ -16,14 +16,6 @@ public class LoginParam { * 密码 */ private String password; - /** - * Application ID - */ - private String appid; - /** - * IMEI码 - */ - private String imei; public String getUsername() { return username; @@ -40,20 +32,4 @@ public class LoginParam { public void setPassword(String password) { this.password = password; } - - public String getAppid() { - return appid; - } - - public void setAppid(String appid) { - this.appid = appid; - } - - public String getImei() { - return imei; - } - - public void setImei(String imei) { - this.imei = imei; - } } diff --git a/springboot-jwt/src/main/java/com/xncoding/jwt/common/constant/ConstantsList.java b/springboot-jwt/src/main/java/com/xncoding/jwt/common/constant/ConstantsList.java deleted file mode 100644 index cbca0e3..0000000 --- a/springboot-jwt/src/main/java/com/xncoding/jwt/common/constant/ConstantsList.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.xncoding.jwt.common.constant; - -import java.util.ArrayList; -import java.util.List; - -/** - * 常量列表 - * - * @author XiongNeng - * @version 1.0 - * @since 2018/01/07 - */ -public class ConstantsList { - // 应收款项列表 - public static final List INCOME_TYPE_LIST = new ArrayList() {{ - add("租金"); - add("市场管理费"); - add("物业管理费"); - add("其他"); - }}; - - // 市场列表 - public static final List MARKET_LIST = new ArrayList() {{ - add("一期市场"); - add("二期市场"); - add("三期市场"); - }}; - - // 业态 - public static final List BUSINESS_LIST = new ArrayList() {{ - add("男装"); - add("女装"); - add("玩具"); - add("餐饮"); - add("家具"); - }}; -} diff --git a/springboot-jwt/src/main/java/com/xncoding/jwt/common/constant/DictMap.java b/springboot-jwt/src/main/java/com/xncoding/jwt/common/constant/DictMap.java deleted file mode 100644 index bc914ae..0000000 --- a/springboot-jwt/src/main/java/com/xncoding/jwt/common/constant/DictMap.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.xncoding.jwt.common.constant; - -import java.util.HashMap; -import java.util.Map; -import java.util.TreeMap; - -/** - * 表常量字典 - * - * @author XiongNeng - * @version 1.0 - * @since 2018/01/07 - */ -public class DictMap { - /** - * 后台管理用户表 - 状态(1:正常 2:禁用) - */ - public static final String KEY_USER_STATUS = "t_manager.status"; - /** - * POS机表 - 机具状态(1:正常 2:故障 3:维修中(返厂) 4:已禁用(丢失) 5:已停用(回收)) - */ - public static final String KEY_POS_POS_STATUS = "t_pos.pos_state"; - /** - * POS机监控表 - 在线状态(1:在线 2:离线) - */ - public static final String KEY_POS_MONITOR_STATUS = "t_pos_monitor.online_state"; - /** - * APP表 - 发布范围(1:全网发布 2:灰度发布) - */ - public static final String KEY_APP_PUBLISH_RANGE = "t_app.publish_range"; - - /** - * 内部用，ClassName + FieldName为key - */ - private static final Map> _imap = new HashMap<>(); - - static { - _imap.put(KEY_USER_STATUS, new TreeMap() {{ - put(1, "正常"); - put(2, "禁用"); - }}); - _imap.put(KEY_POS_POS_STATUS, new TreeMap() {{ - put(1, "正常"); - put(2, "故障"); - put(3, "维修中(返厂)"); - put(4, "已禁用(丢失)"); - put(5, "已停用(回收)"); - }}); - _imap.put(KEY_POS_MONITOR_STATUS, new TreeMap() {{ - put(1, "在线"); - put(2, "离线"); - }}); - _imap.put(KEY_APP_PUBLISH_RANGE, new TreeMap() {{ - put(1, "全网发布"); - put(2, "灰度发布"); - }}); - } - - /** - * 根据字典类型key获取某个字典Map - * - * @param type 常量类型 - * @return 字典Map - */ - public static TreeMap map(String type) { - return _imap.get(type); - } - - /** - * 根据字典类型和数字获取对应的字符串 - * - * @param type 字典类型 - * @param key 数字 - * @return 对应的字符串 - */ - public static String value(String type, Integer key) { - return key != null ? map(type).get(key) : null; - } - -} diff --git a/springboot-jwt/src/main/java/com/xncoding/jwt/common/util/CommonUtil.java b/springboot-jwt/src/main/java/com/xncoding/jwt/common/util/CommonUtil.java deleted file mode 100644 index 6b28c11..0000000 --- a/springboot-jwt/src/main/java/com/xncoding/jwt/common/util/CommonUtil.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.xncoding.jwt.common.util; - -/** - * 常用工具类，字符串、数字相关 - * - * @author XiongNeng - * @version 1.0 - * @since 2018/1/15 - */ -public class CommonUtil { - /** - * 检查某版本是否比现在版本更大些 - * - * @param version 某版本 - * @param nowVersion 现在使用的版本 - * @return 是否版本数更大 - */ - public static boolean isNewer(String version, String nowVersion) { - try { - String[] versions = version.split("\\."); - String[] nowVersions = nowVersion.split("\\."); - - if (versions.length != nowVersions.length) { - return false; - } - int sum = 0; - for (String v : versions) { - sum += sum * 10 + Integer.valueOf(v); - } - - int nowSum = 0; - for (String nv : nowVersions) { - nowSum += nowSum * 10 + Integer.valueOf(nv); - } - - return sum > nowSum; - } catch (NumberFormatException e) { - return false; - } - } -} diff --git a/springboot-jwt/src/main/java/com/xncoding/jwt/common/util/DateUtil.java b/springboot-jwt/src/main/java/com/xncoding/jwt/common/util/DateUtil.java deleted file mode 100644 index 120de61..0000000 --- a/springboot-jwt/src/main/java/com/xncoding/jwt/common/util/DateUtil.java +++ /dev/null @@ -1,296 +0,0 @@ -/** - * Copyright (c) 2015-2016, Chill Zhuang 庄骞 (smallchill@163.com). - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.xncoding.jwt.common.util; - -import java.sql.Timestamp; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; - -public class DateUtil { - private final static SimpleDateFormat sdfYear = new SimpleDateFormat("yyyy"); - - private final static SimpleDateFormat sdfDay = new SimpleDateFormat("yyyy-MM-dd"); - - private final static SimpleDateFormat sdfDays = new SimpleDateFormat("yyyyMMdd"); - - private final static SimpleDateFormat sdfTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - private final static SimpleDateFormat sdfmsTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); - - private final static SimpleDateFormat allTime = new SimpleDateFormat("yyyyMMddHHmmss"); - - private final static SimpleDateFormat sdfDay_ = new SimpleDateFormat("yyyy/MM/dd"); - - - /** - * 获取YYYY格式 - * - * @return - */ - public static String getYear() { - return sdfYear.format(new Date()); - } - - /** - * 获取YYYY格式 - * - * @return - */ - public static String getYear(Date date) { - return sdfYear.format(date); - } - - /** - * 获取YYYY-MM-DD格式 - * - * @return - */ - public static String getDay() { - return sdfDay.format(new Date()); - } - - /** - * 获取YYYY-MM-DD格式 - * - * @return - */ - public static String getDay(Date date) { - return sdfDay.format(date); - } - - /** - * 获取YYYYMMDD格式 - * - * @return - */ - public static String getDays() { - return sdfDays.format(new Date()); - } - - /** - * 获取YYYYMMDD格式 - * - * @return - */ - public static String getDays(Date date) { - return sdfDays.format(date); - } - - /** - * 获取YYYY/MM/DD格式 - * - * @return - */ - public static String getDays_(Date date) { - return sdfDay_.format(date); - } - - /** - * 获取YYYY-MM-DD HH:mm:ss格式 - * - * @return - */ - public static String getTime() { - return sdfTime.format(new Date()); - } - - /** - * 获取YYYY-MM-DD HH:mm:ss.SSS格式 - * - * @return - */ - public static String getMsTime() { - return sdfmsTime.format(new Date()); - } - - /** - * 获取YYYYMMDDHHmmss格式 - * - * @return - */ - public static String getAllTime() { - return allTime.format(new Date()); - } - - /** - * 获取YYYY-MM-DD HH:mm:ss格式 - * - * @return - */ - public static String getTime(Date date) { - return sdfTime.format(date); - } - - /** - * @param s - * @param e - * @return boolean - * @throws - * @Title: compareDate - * @Description:(日期比较，如果s>=e 返回true 否则返回false) - * @author luguosui - */ - public static boolean compareDate(String s, String e) { - if (parseDate(s) == null || parseDate(e) == null) { - return false; - } - return parseDate(s).getTime() >= parseDate(e).getTime(); - } - - /** - * 格式化日期 - * - * @return - */ - public static Date parseDate(String date) { - try { - return sdfDay.parse(date); - } catch (ParseException e) { - e.printStackTrace(); - return null; - } - } - - /** - * 格式化日期 - * - * @return - */ - public static Date parseTime(String date) { - try { - return sdfTime.parse(date); - } catch (ParseException e) { - e.printStackTrace(); - return null; - } - } - - /** - * 格式化日期 - * - * @return - */ - public static Date parse(String date, String pattern) { - DateFormat fmt = new SimpleDateFormat(pattern); - try { - return fmt.parse(date); - } catch (ParseException e) { - e.printStackTrace(); - return null; - } - } - - /** - * 格式化日期 - * - * @return - */ - public static String format(Date date, String pattern) { - DateFormat fmt = new SimpleDateFormat(pattern); - return fmt.format(date); - } - - /** - * 把日期转换为Timestamp - * - * @param date - * @return - */ - public static Timestamp format(Date date) { - return new Timestamp(date.getTime()); - } - - /** - * 校验日期是否合法 - * - * @return - */ - public static boolean isValidDate(String s) { - try { - sdfTime.parse(s); - return true; - } catch (Exception e) { - // 如果throw java.text.ParseException或者NullPointerException，就说明格式不对 - return false; - } - } - - /** - * 校验日期是否合法 - * - * @return - */ - public static boolean isValidDate(String s, String pattern) { - DateFormat fmt = new SimpleDateFormat(pattern); - try { - fmt.parse(s); - return true; - } catch (Exception e) { - // 如果throw java.text.ParseException或者NullPointerException，就说明格式不对 - return false; - } - } - - /** - * 获取指定日期偏移指定时间后的时间 - * - * @param date 基准日期 - * @param calendarField 偏移的粒度大小（小时、天、月等）使用Calendar中的常数 - * @param offsite 偏移量，正数为向后偏移，负数为向前偏移 - * @return 偏移后的日期 - */ - public static Date offsiteDate(Date date, int calendarField, int offsite) { - Calendar cal = Calendar.getInstance(); - cal.setTime(date); - cal.add(calendarField, offsite); - return cal.getTime(); - } - - /** - * 返回日期零时 - * - * @param date 目标日期 - * @return 目标日期零时 - */ - public static Date getDateStartTime(Date date) { - String str = format(date, "yyyyMMdd") + "000000"; - try { - return allTime.parse(str); - } catch (ParseException e) { - return null; - } - } - - - /** - * 返回日期最后时间End - * - * @param date 目标日期 - * @return 目标日日期最后时间 - */ - public static Date getDateEndTime(Date date) { - String str = format(date, "yyyyMMdd") + "235959"; - try { - return allTime.parse(str); - } catch (ParseException e) { - return null; - } - } - -} diff --git a/springboot-jwt/src/main/java/com/xncoding/jwt/common/util/JWTUtil.java b/springboot-jwt/src/main/java/com/xncoding/jwt/common/util/JWTUtil.java index d2a5ac5..ad2b9b2 100644 --- a/springboot-jwt/src/main/java/com/xncoding/jwt/common/util/JWTUtil.java +++ b/springboot-jwt/src/main/java/com/xncoding/jwt/common/util/JWTUtil.java @@ -3,12 +3,10 @@ package com.xncoding.jwt.common.util; import com.auth0.jwt.JWT; import com.auth0.jwt.JWTVerifier; import com.auth0.jwt.algorithms.Algorithm; -import com.auth0.jwt.exceptions.JWTDecodeException; import com.auth0.jwt.interfaces.DecodedJWT; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.UnsupportedEncodingException; import java.util.Date; public class JWTUtil { @@ -18,6 +16,23 @@ public class JWTUtil { // 过期时间5分钟 private static final long EXPIRE_TIME = 5 * 60 * 1000; + /** + * 生成签名,5min后过期 + * + * @param username 用户名 + * @param secret 用户的密码 + * @return 加密的token + */ + public static String sign(String username, String secret) { + Date date = new Date(System.currentTimeMillis() + EXPIRE_TIME); + Algorithm algorithm = Algorithm.HMAC256(secret); + // 附带username信息 + return JWT.create() + .withClaim("username", username) + .withExpiresAt(date) + .sign(algorithm); + } + /** * 校验token是否正确 * @@ -26,17 +41,12 @@ public class JWTUtil { * @return 是否正确 */ public static boolean verify(String token, String username, String secret) { - try { - Algorithm algorithm = Algorithm.HMAC256(secret); - JWTVerifier verifier = JWT.require(algorithm) - .withClaim("username", username) - .build(); - DecodedJWT jwt = verifier.verify(token); - return true; - } catch (Exception exception) { - log.error("校验token失败", exception); - return false; - } + Algorithm algorithm = Algorithm.HMAC256(secret); + JWTVerifier verifier = JWT.require(algorithm) + .withClaim("username", username) + .build(); + DecodedJWT jwt = verifier.verify(token); + return true; } /** @@ -45,129 +55,8 @@ public class JWTUtil { * @return token中包含的用户名 */ public static String getUsername(String token) { - try { - DecodedJWT jwt = JWT.decode(token); - return jwt.getClaim("username").asString(); - } catch (JWTDecodeException e) { - return null; - } - } - - /** - * 生成签名,5min后过期 - * - * @param username 用户名 - * @param secret 用户的密码 - * @return 加密的token - */ - public static String sign(String username, String secret) { - try { - Date date = new Date(System.currentTimeMillis() + EXPIRE_TIME); - Algorithm algorithm = Algorithm.HMAC256(secret); - // 附带username信息 - return JWT.create() - .withClaim("username", username) - .withExpiresAt(date) - .sign(algorithm); - } catch (UnsupportedEncodingException e) { - return null; - } - } - - /*----------------------------以下是socket校验--------------------------*/ - /** - * 生成Socket Token签名, 5min后过期 - * - * @param username 用户名 - * @param secret 用户的密码 - * @param appid applicationId - * @param imei IMEI码 - * @return 加密的token - */ - public static String signSocket(String username, String secret, String appid, String imei) { - try { - Date date = new Date(System.currentTimeMillis() + EXPIRE_TIME); - Algorithm algorithm = Algorithm.HMAC256(secret); - // 附带username信息 - return JWT.create() - .withClaim("username", username) - .withClaim("appid", appid) - .withClaim("imei", imei) - .withExpiresAt(date) - .sign(algorithm); - } catch (UnsupportedEncodingException e) { - return null; - } - } - - /** - * 校验token是否正确 - * - * @param token 密钥 - * @param secret 用户的密码 - * @return 是否正确 - */ - public static boolean verifySocket(String token, String secret) { - try { - DecodedJWT jwt1 = JWT.decode(token); - String username = jwt1.getClaim("username").asString(); - String appid = jwt1.getClaim("appid").asString(); - String imei = jwt1.getClaim("imei").asString(); - - Algorithm algorithm = Algorithm.HMAC256(secret); - JWTVerifier verifier = JWT.require(algorithm) - .withClaim("username", username) - .withClaim("appid", appid) - .withClaim("imei", imei) - .build(); - DecodedJWT jwt = verifier.verify(token); - return true; - } catch (Exception exception) { - log.error("校验token失败", exception); - return false; - } - } - - /** - * 获得token中的信息无需secret解密也能获得 - * - * @return token中包含的用户名 - */ - public static String getSocketUsername(String token) { - try { - DecodedJWT jwt1 = JWT.decode(token); - return jwt1.getClaim("username").asString(); - } catch (JWTDecodeException e) { - return null; - } - } - - /** - * 获得token中的信息无需secret解密也能获得 - * - * @return token中包含的Appid - */ - public static String getSocketAppid(String token) { - try { - DecodedJWT jwt1 = JWT.decode(token); - return jwt1.getClaim("appid").asString(); - } catch (JWTDecodeException e) { - return null; - } - } - - /** - * 获得token中的信息无需secret解密也能获得 - * - * @return token中包含的IMEI码 - */ - public static String getSocketImei(String token) { - try { - DecodedJWT jwt1 = JWT.decode(token); - return jwt1.getClaim("imei").asString(); - } catch (JWTDecodeException e) { - return null; - } + DecodedJWT jwt = JWT.decode(token); + return jwt.getClaim("username").asString(); } } diff --git a/springboot-jwt/src/main/java/com/xncoding/jwt/common/dao/entity/Manager.java b/springboot-jwt/src/main/java/com/xncoding/jwt/dao/domain/Manager.java similarity index 98% rename from springboot-jwt/src/main/java/com/xncoding/jwt/common/dao/entity/Manager.java rename to springboot-jwt/src/main/java/com/xncoding/jwt/dao/domain/Manager.java index 980ccf0..f1cc535 100644 --- a/springboot-jwt/src/main/java/com/xncoding/jwt/common/dao/entity/Manager.java +++ b/springboot-jwt/src/main/java/com/xncoding/jwt/dao/domain/Manager.java @@ -1,4 +1,4 @@ -package com.xncoding.jwt.common.dao.entity; +package com.xncoding.jwt.dao.domain; import java.io.Serializable; import java.util.Date; diff --git a/springboot-jwt/src/main/java/com/xncoding/jwt/common/dao/entity/ManagerRole.java b/springboot-jwt/src/main/java/com/xncoding/jwt/dao/domain/ManagerRole.java similarity index 98% rename from springboot-jwt/src/main/java/com/xncoding/jwt/common/dao/entity/ManagerRole.java rename to springboot-jwt/src/main/java/com/xncoding/jwt/dao/domain/ManagerRole.java index 8ea4d4c..a8e1e9f 100644 --- a/springboot-jwt/src/main/java/com/xncoding/jwt/common/dao/entity/ManagerRole.java +++ b/springboot-jwt/src/main/java/com/xncoding/jwt/dao/domain/ManagerRole.java @@ -1,4 +1,4 @@ -package com.xncoding.jwt.common.dao.entity; +package com.xncoding.jwt.dao.domain; import java.io.Serializable; import java.util.Date; diff --git a/springboot-jwt/src/main/java/com/xncoding/jwt/common/dao/entity/Permission.java b/springboot-jwt/src/main/java/com/xncoding/jwt/dao/domain/Permission.java similarity index 98% rename from springboot-jwt/src/main/java/com/xncoding/jwt/common/dao/entity/Permission.java rename to springboot-jwt/src/main/java/com/xncoding/jwt/dao/domain/Permission.java index 41c9af7..9349efa 100644 --- a/springboot-jwt/src/main/java/com/xncoding/jwt/common/dao/entity/Permission.java +++ b/springboot-jwt/src/main/java/com/xncoding/jwt/dao/domain/Permission.java @@ -1,4 +1,4 @@ -package com.xncoding.jwt.common.dao.entity; +package com.xncoding.jwt.dao.domain; import java.io.Serializable; import java.util.Date; diff --git a/springboot-jwt/src/main/java/com/xncoding/jwt/common/dao/entity/Role.java b/springboot-jwt/src/main/java/com/xncoding/jwt/dao/domain/Role.java similarity index 98% rename from springboot-jwt/src/main/java/com/xncoding/jwt/common/dao/entity/Role.java rename to springboot-jwt/src/main/java/com/xncoding/jwt/dao/domain/Role.java index c9d9475..29fb5b5 100644 --- a/springboot-jwt/src/main/java/com/xncoding/jwt/common/dao/entity/Role.java +++ b/springboot-jwt/src/main/java/com/xncoding/jwt/dao/domain/Role.java @@ -1,4 +1,4 @@ -package com.xncoding.jwt.common.dao.entity; +package com.xncoding.jwt.dao.domain; import java.io.Serializable; import java.util.Date; diff --git a/springboot-jwt/src/main/java/com/xncoding/jwt/common/dao/entity/RolePermission.java b/springboot-jwt/src/main/java/com/xncoding/jwt/dao/domain/RolePermission.java similarity index 98% rename from springboot-jwt/src/main/java/com/xncoding/jwt/common/dao/entity/RolePermission.java rename to springboot-jwt/src/main/java/com/xncoding/jwt/dao/domain/RolePermission.java index f246604..031dc29 100644 --- a/springboot-jwt/src/main/java/com/xncoding/jwt/common/dao/entity/RolePermission.java +++ b/springboot-jwt/src/main/java/com/xncoding/jwt/dao/domain/RolePermission.java @@ -1,4 +1,4 @@ -package com.xncoding.jwt.common.dao.entity; +package com.xncoding.jwt.dao.domain; import java.io.Serializable; import java.util.Date; diff --git a/springboot-jwt/src/main/java/com/xncoding/jwt/dao/entity/ManagerInfo.java b/springboot-jwt/src/main/java/com/xncoding/jwt/model/ManagerInfo.java similarity index 86% rename from springboot-jwt/src/main/java/com/xncoding/jwt/dao/entity/ManagerInfo.java rename to springboot-jwt/src/main/java/com/xncoding/jwt/model/ManagerInfo.java index 74951d9..d7b79b8 100644 --- a/springboot-jwt/src/main/java/com/xncoding/jwt/dao/entity/ManagerInfo.java +++ b/springboot-jwt/src/main/java/com/xncoding/jwt/model/ManagerInfo.java @@ -1,11 +1,9 @@ -package com.xncoding.jwt.dao.entity; +package com.xncoding.jwt.model; -import com.xncoding.jwt.common.constant.DictMap; -import com.xncoding.jwt.common.dao.entity.Manager; +import com.xncoding.jwt.dao.domain.Manager; import java.io.Serializable; import java.util.List; -import java.util.Map; /** * Description: 后台运维管理员信息 @@ -91,7 +89,4 @@ public class ManagerInfo extends Manager implements Serializable { this.pnames = pnames; } - public void buildTable() { - stateStr = DictMap.value(DictMap.KEY_USER_STATUS, getState()); - } } diff --git a/springboot-jwt/src/main/java/com/xncoding/jwt/dao/entity/SysRole.java b/springboot-jwt/src/main/java/com/xncoding/jwt/model/SysRole.java similarity index 78% rename from springboot-jwt/src/main/java/com/xncoding/jwt/dao/entity/SysRole.java rename to springboot-jwt/src/main/java/com/xncoding/jwt/model/SysRole.java index a3205a6..4f6231f 100644 --- a/springboot-jwt/src/main/java/com/xncoding/jwt/dao/entity/SysRole.java +++ b/springboot-jwt/src/main/java/com/xncoding/jwt/model/SysRole.java @@ -1,7 +1,7 @@ -package com.xncoding.jwt.dao.entity; +package com.xncoding.jwt.model; -import com.xncoding.jwt.common.dao.entity.Permission; -import com.xncoding.jwt.common.dao.entity.Role; +import com.xncoding.jwt.dao.domain.Permission; +import com.xncoding.jwt.dao.domain.Role; import java.io.Serializable; import java.util.List; diff --git a/springboot-jwt/src/main/java/com/xncoding/jwt/service/ManagerInfoService.java b/springboot-jwt/src/main/java/com/xncoding/jwt/service/ManagerInfoService.java index daa87d6..00e442f 100644 --- a/springboot-jwt/src/main/java/com/xncoding/jwt/service/ManagerInfoService.java +++ b/springboot-jwt/src/main/java/com/xncoding/jwt/service/ManagerInfoService.java @@ -1,7 +1,8 @@ package com.xncoding.jwt.service; -import com.xncoding.jwt.dao.entity.ManagerInfo; -import com.xncoding.jwt.dao.entity.SysRole; +import com.xncoding.jwt.model.ManagerInfo; +import com.xncoding.jwt.model.SysRole; +import com.xncoding.jwt.shiro.ShiroKit; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -18,20 +19,23 @@ public class ManagerInfoService { /** * 通过名称查找用户 + * 这里我直接写常量，实际生产环境会通过DAO访问数据库 * * @param username * @return */ public ManagerInfo findByUsername(String username) { ManagerInfo managerInfo = new ManagerInfo(); + managerInfo.setUsername(username); managerInfo.setPids("1,2,3"); managerInfo.setPidsList(Arrays.asList(1, 2, 3)); managerInfo.setPnames("第1个,第2个"); managerInfo.setState(1); managerInfo.setCreatedTime(new Date()); managerInfo.setName("系统管理员"); - managerInfo.setPassword("4a496ba2a4172c71540fa643ddc8bb7c"); - managerInfo.setSalt("b4752b4b73034de06afb2db30fe19061"); + // 随机数 + managerInfo.setSalt("ef748186673033723bbf4e056f4ec92e"); + managerInfo.setPassword("da9c3061ae5c0973a3d48e4e721cfbad"); List roles = new ArrayList<>(); SysRole role = new SysRole(); role.setId(1); diff --git a/springboot-jwt/src/main/java/com/xncoding/jwt/shiro/MyShiroRealm.java b/springboot-jwt/src/main/java/com/xncoding/jwt/shiro/MyShiroRealm.java index abc84a6..094d86e 100644 --- a/springboot-jwt/src/main/java/com/xncoding/jwt/shiro/MyShiroRealm.java +++ b/springboot-jwt/src/main/java/com/xncoding/jwt/shiro/MyShiroRealm.java @@ -1,9 +1,9 @@ package com.xncoding.jwt.shiro; -import com.xncoding.jwt.common.dao.entity.Permission; +import com.xncoding.jwt.dao.domain.Permission; import com.xncoding.jwt.common.util.JWTUtil; -import com.xncoding.jwt.dao.entity.ManagerInfo; -import com.xncoding.jwt.dao.entity.SysRole; +import com.xncoding.jwt.model.ManagerInfo; +import com.xncoding.jwt.model.SysRole; import com.xncoding.jwt.service.ManagerInfoService; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationInfo; diff --git a/springboot-jwt/src/main/java/com/xncoding/jwt/shiro/ShiroKit.java b/springboot-jwt/src/main/java/com/xncoding/jwt/shiro/ShiroKit.java index 9a77dc1..61b1960 100644 --- a/springboot-jwt/src/main/java/com/xncoding/jwt/shiro/ShiroKit.java +++ b/springboot-jwt/src/main/java/com/xncoding/jwt/shiro/ShiroKit.java @@ -15,11 +15,9 @@ */ package com.xncoding.jwt.shiro; -import com.xncoding.jwt.dao.entity.ManagerInfo; import org.apache.shiro.SecurityUtils; import org.apache.shiro.crypto.SecureRandomNumberGenerator; import org.apache.shiro.crypto.hash.SimpleHash; -import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; /** diff --git a/springboot-jwt/src/main/resources/application.yml b/springboot-jwt/src/main/resources/application.yml index dc49391..1925f98 100644 --- a/springboot-jwt/src/main/resources/application.yml +++ b/springboot-jwt/src/main/resources/application.yml @@ -27,20 +27,5 @@ logging: ROOT: INFO com: xncoding: DEBUG - file: E:/logs/pos-api.log + file: D:/logs/pos-api.log ---- - -##################################################################### -######################## 测试环境profile ########################## -##################################################################### - -spring: - profiles: test - -logging: - level: - ROOT: INFO - com: - xncoding: DEBUG - file: /var/logs/pos-api.log diff --git a/springboot-jwt/src/test/java/com/xncoding/jwt/ApplicationTests.java b/springboot-jwt/src/test/java/com/xncoding/jwt/ApplicationTests.java deleted file mode 100644 index 7a7d2b8..0000000 --- a/springboot-jwt/src/test/java/com/xncoding/jwt/ApplicationTests.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.xncoding.jwt; - -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -/** - * 测试密码加密 - */ - -@RunWith(SpringRunner.class) -@SpringBootTest -public class ApplicationTests { - -} diff --git a/springboot-jwt/src/test/java/com/xncoding/jwt/SimpleTest.java b/springboot-jwt/src/test/java/com/xncoding/jwt/SimpleTest.java index 9df78b3..c3a0377 100644 --- a/springboot-jwt/src/test/java/com/xncoding/jwt/SimpleTest.java +++ b/springboot-jwt/src/test/java/com/xncoding/jwt/SimpleTest.java @@ -1,5 +1,6 @@ package com.xncoding.jwt; +import com.xncoding.jwt.common.util.JWTUtil; import com.xncoding.jwt.shiro.ShiroKit; import org.junit.Test; @@ -12,14 +13,20 @@ import org.junit.Test; */ public class SimpleTest { @Test - public void testMd5() { - //盐（用户名+随机数） + public void testJwt() { String username = "admin"; + //随机数 String salt = ShiroKit.getRandomSalt(16); //原密码 String password = "12345678"; String encodedPassword = ShiroKit.md5(password, username + salt); - System.out.println("这个是保存进数据库的密码:" + encodedPassword); - System.out.println("这个是保存进数据库的盐:" + salt); + System.out.println("这个是保存进数据库的随机数:" + salt); + System.out.println("这个是保存进数据库的加密后密码:" + encodedPassword); + // 生成token + String token = JWTUtil.sign(username, encodedPassword); + System.out.println("token=" + token); + // 验证token + JWTUtil.verify(token, username, encodedPassword); } + } diff --git a/springboot-jwt/src/test/java/com/xncoding/jwt/common/util/CommonUtilTest.java b/springboot-jwt/src/test/java/com/xncoding/jwt/common/util/CommonUtilTest.java deleted file mode 100644 index c656e25..0000000 --- a/springboot-jwt/src/test/java/com/xncoding/jwt/common/util/CommonUtilTest.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.xncoding.jwt.common.util; - -import org.junit.Test; - -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; - -public class CommonUtilTest { - - @Test - public void isNewer() { - assertThat(CommonUtil.isNewer("1.2.1", "1.2.0"), is(true)); - assertThat(CommonUtil.isNewer("1.2", "1.2.0"), is(false)); - assertThat(CommonUtil.isNewer("2.1.9", "1.2.0"), is(true)); - assertThat(CommonUtil.isNewer("adfa.1.3", "1.2.0"), is(false)); - } - - @Test - public void testTimestamp() { - // 1516072088813 - // 1441594722 - System.out.println(System.currentTimeMillis()); - } -} \ No newline at end of file diff --git a/springboot-jwt/src/test/resources/keystore.jks b/springboot-jwt/src/test/resources/keystore.jks deleted file mode 100644 index a714115b265f23b6e072e95aa91d1ee892bdc2c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1334 zcmezO_TO6u1_mY|W&~rllGNgotL8FFTi2PkQ-$*RMNTD@?B(*yu80`TZw(iLXWCCGw{pP?BzV?t1+$ z%aISwOzWL2HCLNV-#6pt{2MbCeN#7?aZaN@*-v0rThp8EF*hVSn_|I zsyk!7e zYLnjVMQyt!b7n0(ZK>1nP-C;~QfZ~c3Ln~o7}?wj5;p*?f|A%)!!r?5_4{8;gL z)Zqo*eeHIOybj1FYfkcF=3%FX^9b2r(y*(Ge6#$!E& z^pyuXS69jBmcBCHwNEEy_0IG&GQAsWnRMr}-~0A|r_+YrwYx6PPUI5VE3tKn4A<8S z(^8LUnRPC43w~l|X;_?ni+^EpuNh0hjaNHQ{Ql85eb(IgWyvy|mX;mNPWU(@mRVZ) zs*}apq!L&4)Vv4lMYEk~u>_OEK}wHrYKpI5}JEVo=Z7w<;MkHQKL=FF%>S?SDJt=KuGdDutd+ z(Ed8-2+y?t@s)GGEV;^S_t=r=ao5RbPpVpV#qZj__SR53E<10Tnl-vN&S2tXm~2_bFEyv@g#j-cr&gOs+jm}Ix@KiCh%w|g;ACSCWnmL$att*T zHV_1HIC!{%^K(;mgG&-iQVkUiC6x+3B`JoY z2ErgE%sf2h<>h*yOr@8cpKBl|&TD97U}0=%Xl`U|Y#asVS{fTbxiq%DaXzwdf!Ub3 zv6sQ1v6HE>k>OIZNq+5w9d9|NE#K)Vz5LjMh?ljwY^<)Y9`yFs9h%hnwnA>h5)Jv) zCN2i&eIJKMy*oESn=>q-!7}UG4AtLCUp5P#E_jowQ1op2;#2NC6PMT7?2BJhCz7qq z@N`L~aLKL(K{GV}n%-FQW#@P2%VoJoEAv0dirYAuO*hK7lZj2-txt-0wanWV-{$=~;pSb^?#h&B0kAUe7shx_i zGoOeh#H@R$vcJhmpV7Cln)j5QQhD<1#f>v(t_f-T!}CsPe$!c=yrMV$)-TlAFETX# z-4yvhdtt>*Q)zjnr~cV4v#wi7E|l$7&UjqgZP_cc|Dp-A!NNBW7FgC8J-#kk@@x0% Gy#D|dcP%;q