diff --git a/signin/src/main/java/com/ccsens/signin/api/FiotExplorerController.java b/signin/src/main/java/com/ccsens/signin/api/FiotExplorerController.java index 76effe8f..1c7b8ac3 100644 --- a/signin/src/main/java/com/ccsens/signin/api/FiotExplorerController.java +++ b/signin/src/main/java/com/ccsens/signin/api/FiotExplorerController.java @@ -46,9 +46,9 @@ public class FiotExplorerController { public JsonResponse userSignin(@ApiParam @Validated @RequestBody(required = true)FiotDto.Signin signin) throws Exception { log.info("物联网用户登录：{}", signin); String type = "FIOT"; - WxXcxUtil.WechatUser wechatUser = WxXcxUtil.getUserInfo(signin.getCode(), "yanyuan"); + WxXcxUtil.WechatUser wechatUser = WxXcxUtil.getUserInfo(signin.getCode(), type); log.info("用户账号:{}", wechatUser); - FiotSigninResponse response = FiotExplorerSigninUtil.getToken(wechatUser.openid, signin.getNickName(), signin.getAvatar(), WxXcxUtil.appId(type)); + FiotSigninResponse response = FiotExplorerSigninUtil.getToken(wechatUser.openid, signin.getNickName(), signin.getAvatar()); FiotVo.Signin vo = new FiotVo.Signin(); vo.setToken(response.getToken()); vo.setExpireAt(response.getExpireAt()); diff --git a/signin/src/main/resources/application-dev.yml b/signin/src/main/resources/application-dev.yml index f5760b8c..428810cd 100644 --- a/signin/src/main/resources/application-dev.yml +++ b/signin/src/main/resources/application-dev.yml @@ -57,4 +57,7 @@ file: path: /home/cloud/tall/uploads/ domain: http://localhost:7030/v1.0/ imgDomain: http://localhost:7030/v1.0/uploads\ - queryPowerAddress: /power/query \ No newline at end of file + queryPowerAddress: /power/query +fiot: + appId: mEulfDBBOFeOjGavy + secret: FaFKWiwVUWbJmfxVnSdd \ No newline at end of file diff --git a/signin/src/main/resources/application-prod.yml b/signin/src/main/resources/application-prod.yml index ea11a8c5..91f9d54e 100644 --- a/signin/src/main/resources/application-prod.yml +++ b/signin/src/main/resources/application-prod.yml @@ -45,4 +45,7 @@ file: path: /home/cloud/tall/uploads/ domain: https://www.tall.wiki/gateway/tall/v3.0/ imgDomain: https://www.tall.wiki/gateway/tall/v3.0/uploads - queryPowerAddress: /power/query \ No newline at end of file + queryPowerAddress: /power/query +fiot: + appId: mEulfDBBOFeOjGavy + secret: FaFKWiwVUWbJmfxVnSdd \ No newline at end of file diff --git a/signin/src/main/resources/application-test.yml b/signin/src/main/resources/application-test.yml index 6a2ef89b..029276bd 100644 --- a/signin/src/main/resources/application-test.yml +++ b/signin/src/main/resources/application-test.yml @@ -47,4 +47,7 @@ file: queryPowerAddress: /power/query #file: # domain: http://192.168.0.99/gateway/tall/v1.0/ -# imgDomain: http://192.168.0.99/gateway/tall/v1.0/uploads \ No newline at end of file +# imgDomain: http://192.168.0.99/gateway/tall/v1.0/uploads +fiot: + appId: mEulfDBBOFeOjGavy + secret: FaFKWiwVUWbJmfxVnSdd \ No newline at end of file diff --git a/util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java b/util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java index e6f717b2..c6267610 100644 --- a/util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java +++ b/util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java @@ -186,8 +186,8 @@ public class WxXcxUtil { private static final String APPID_YANYUAN = "wx733e229f00dc5c6f"; private static final String SECRET_YANYUAN = "9aa0a81973cc5f13c02548b5244accc2"; //物联网 FIOT - private static final String APP_KEY_FIOT = "mEulfDBBOFeOjGavy"; - private static final String APP_SECRET_FIOT = "FaFKWiwVUWbJmfxVnSdd"; + private static final String APP_KEY_FIOT = "wx1989853133e3da70"; + private static final String APP_SECRET_FIOT = "272ab181a1c6e87cedb9bb1373d30c0e"; private static final String mchid = ""; private static final String key = ""; diff --git a/wechatutil/src/main/java/com/ccsens/wechatutil/bean/po/wxfiotexplorer/FiotSignin.java b/wechatutil/src/main/java/com/ccsens/wechatutil/bean/po/wxfiotexplorer/FiotSignin.java index d8d556c5..e8466875 100644 --- a/wechatutil/src/main/java/com/ccsens/wechatutil/bean/po/wxfiotexplorer/FiotSignin.java +++ b/wechatutil/src/main/java/com/ccsens/wechatutil/bean/po/wxfiotexplorer/FiotSignin.java @@ -70,16 +70,15 @@ public class FiotSignin { public FiotSignin() { } - public FiotSignin(String openId, String nickName, String avatar, String appKey) throws Exception { + public FiotSignin(String openId, String nickName, String avatar, String appKey, String appSecret) throws Exception { this(); this.WxOpenID = openId; this.NickName = nickName; this.Avatar = avatar; this.AppKey = appKey; JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(this)); - this.Signature = TC3Util.generateSignature(json); + this.Signature = TC3Util.generateSignature(json, appSecret); } - } diff --git a/wechatutil/src/main/java/com/ccsens/wechatutil/util/TC3Util.java b/wechatutil/src/main/java/com/ccsens/wechatutil/util/TC3Util.java index cd52b272..3057a4e5 100644 --- a/wechatutil/src/main/java/com/ccsens/wechatutil/util/TC3Util.java +++ b/wechatutil/src/main/java/com/ccsens/wechatutil/util/TC3Util.java @@ -23,8 +23,6 @@ public class TC3Util { private final static Charset UTF8 = StandardCharsets.UTF_8; private final static String SECRET_ID = "AKIDxhBRRAdplRpwnMfnfGaeRxDBsJTN0NTI"; private final static String SECRET_KEY = "Zrte9MPFo68tMZU8WcXDeqnVx95rYzA6"; - private final static String APP_KEY = "mEulfDBBOFeOjGavy"; - private final static String APP_SECRET = "FaFKWiwVUWbJmfxVnSdd"; private final static String CT_JSON = "application/json; charset=utf-8"; //签名算法 private static final String HMAC_ALGORITHM = "HmacSHA1"; @@ -69,7 +67,7 @@ public class TC3Util { json.put("NickName","wu"); json.put("Avatar","https://thirdwx.qlogo.cn/mmopen/vi_32/4KIkPtTLnuGdQPo1YqiaqRAgjyIPz4NyDzZVwwKJiatibWhszIH02XmWyqnl7LW1zYmRMbF2UYQG5o4N0cgyPH0qw/132"); System.out.println(json); - String s = generateSignature(json); + String s = generateSignature(json, "秘钥"); System.out.println("s:" + s); // String data = "Action=AppCreateCellphoneUser&AppKey=ahPxdK****TGrejd&CountryCode=86&Nonce=71087795&Password=My!P@ssword&PhoneNumber=13900000000&RequestId=8b8d499bbba1ac28b6da21b4&Timestamp=1546315200&VerificationCode=123456"; // Mac mac = Mac.getInstance(HMAC_ALGORITHM); @@ -81,7 +79,7 @@ public class TC3Util { // System.out.println("strSign:" + strSign); } - public static String generateSignature(Map param) throws Exception { + public static String generateSignature(Map param, String appSecret) throws Exception { StringBuilder builder = new StringBuilder(); Set keys = param.keySet(); Object[] keyArr = keys.toArray(); @@ -100,7 +98,7 @@ public class TC3Util { Mac mac = Mac.getInstance(HMAC_ALGORITHM); - SecretKeySpec secretKey = new SecretKeySpec(APP_SECRET.getBytes(), HMAC_ALGORITHM); + SecretKeySpec secretKey = new SecretKeySpec(appSecret.getBytes(), HMAC_ALGORITHM); mac.init(secretKey); byte[] hash = mac.doFinal(plaintext.getBytes()); diff --git a/wechatutil/src/main/java/com/ccsens/wechatutil/wxfiotexplorer/FiotExplorerSigninUtil.java b/wechatutil/src/main/java/com/ccsens/wechatutil/wxfiotexplorer/FiotExplorerSigninUtil.java index fb437233..e06e54ad 100644 --- a/wechatutil/src/main/java/com/ccsens/wechatutil/wxfiotexplorer/FiotExplorerSigninUtil.java +++ b/wechatutil/src/main/java/com/ccsens/wechatutil/wxfiotexplorer/FiotExplorerSigninUtil.java @@ -47,7 +47,7 @@ public class FiotExplorerSigninUtil { - public static FiotSigninResponse getToken(String openId, String nickName, String avatar, String appKey) throws Exception { + public static FiotSigninResponse getToken(String openId, String nickName, String avatar) throws Exception { log.info("物联网查询token：{},{},{}", openId, nickName, avatar); String key = StrUtil.format(TOKEN_KEY, openId); Object o = util.redisUtil.get(key); @@ -57,7 +57,7 @@ public class FiotExplorerSigninUtil { } // 查询token - FiotSignin fiotSignin = new FiotSignin(openId, nickName, avatar, appKey); + FiotSignin fiotSignin = new FiotSignin(openId, nickName, avatar, util.appKey, util.appSecret); log.info("登录：{}", fiotSignin); String s = RestTemplateUtil.postBody(SIGN_URL, fiotSignin); log.info("登录结果：{}", s);