From ca0022d0444ca7a0bfc325c28fe7005eef664ef5 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Mon, 29 Nov 2021 10:42:01 +0800 Subject: [PATCH] =?UTF-8?q?20211129=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-util-prod.yml | 1 + .../com/ccsens/signin/api/UserController.java | 32 ------------------- .../src/main/resources/application-prod.yml | 12 +++---- .../main/resources/mapper_dao/ProjectDap.xml | 2 +- .../java/com/ccsens/util/wx/WxXcxUtil.java | 7 ++++ 5 files changed, 14 insertions(+), 40 deletions(-) diff --git a/cloudutil/src/main/resources/application-util-prod.yml b/cloudutil/src/main/resources/application-util-prod.yml index 6b375dd1..d3a11767 100644 --- a/cloudutil/src/main/resources/application-util-prod.yml +++ b/cloudutil/src/main/resources/application-util-prod.yml @@ -85,6 +85,7 @@ eureka: # defaultZone: http://admin:admin@101.201.226.21:7010/eureka/ defaultZone: http://admin:admin@121.36.3.207:7010/eureka/ +# defaultZone: http://admin:admin@127.0.0.1:7010/eureka/ # defaultZone: http://admin:admin@test.tall.wiki:7010/eureka/ instance: # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server diff --git a/signin/src/main/java/com/ccsens/signin/api/UserController.java b/signin/src/main/java/com/ccsens/signin/api/UserController.java index 270ba807..0f20220c 100644 --- a/signin/src/main/java/com/ccsens/signin/api/UserController.java +++ b/signin/src/main/java/com/ccsens/signin/api/UserController.java @@ -441,38 +441,6 @@ public class UserController { }) @RequestMapping(value = "token",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"}) public JsonResponse getUserByToken(@RequestParam(required = true) String token) throws Exception { -// long start = System.currentTimeMillis(); -// UserVo.TokenToUserId tokenToUserId = new UserVo.TokenToUserId(); - -// // 验证token是否存在 -// String tokenStr = token; -// if (tokenStr == null || !tokenStr.startsWith(WebConstant.HEADER_KEY_TOKEN_PREFIX)) { -// return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN); -// } -// String userToken = tokenStr.substring(WebConstant.HEADER_KEY_TOKEN_PREFIX.length()); -// -// //验证token是否有效 -// Claims claims = null; -// try { -// claims = JwtUtil.parseJWT(userToken, WebConstant.JWT_ACCESS_TOKEN_SECERT); -// }catch(Exception e){ -// return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN); -// } -// //验证用户存根 -// if(userService.tokenNotExistInCache(Long.valueOf(claims.getSubject()))){ -// return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN); -// } -// //验证用户是否禁用 -// SysUser user = userService.getUserById(Long.valueOf(claims.getSubject())); -// if(user.getRecStatus() == WebConstant.REC_STATUS.Disabled.value){ -// return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN); -// } - -// tokenToUserId.setId(Long.valueOf(claims.getSubject())); -// long end = System.currentTimeMillis(); -// log.info("根据token查找userId用时：{}",end - start); - - log.info("MustLogin根据token查找UserId：{}",token); long start = System.currentTimeMillis(); diff --git a/signin/src/main/resources/application-prod.yml b/signin/src/main/resources/application-prod.yml index e8409410..3fa0ad3d 100644 --- a/signin/src/main/resources/application-prod.yml +++ b/signin/src/main/resources/application-prod.yml @@ -11,7 +11,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: - host: 121.36.3.207 + host: 127.0.0.1 password: 111111 port: 5672 username: admin @@ -24,19 +24,17 @@ spring: max-idle: 10 max-wait: -1ms min-idle: 0 -# password: '' - password: 'areowqr!@43ef' + password: '' +# password: 'areowqr!@43ef' port: 6379 timeout: 1000ms swagger: enable: false eureka: instance: - # www.tall.wiki -# ip-address: 140.143.228.3 -# ip-address: 81.70.54.64 - ip-address: 121.36.3.207 +# ip-address: 121.36.3.207 # ip-address: 101.201.226.21 + ip-address: 127.0.0.1 gatewayUrl: https://www.tall.wiki/gateway/ notGatewayUrl: https://www.tall.wiki/ diff --git a/signin/src/main/resources/mapper_dao/ProjectDap.xml b/signin/src/main/resources/mapper_dao/ProjectDap.xml index 0129f858..d59afa62 100644 --- a/signin/src/main/resources/mapper_dao/ProjectDap.xml +++ b/signin/src/main/resources/mapper_dao/ProjectDap.xml @@ -48,7 +48,7 @@ and u.rec_status = 0 WHERE u.id is null - ORDER BY p.sort + ORDER BY p.sort,p.startTime DESC,id DESC 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 26ac0908..a51f9597 100644 --- a/util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java +++ b/util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java @@ -185,6 +185,9 @@ 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 mchid = ""; private static final String key = ""; @@ -208,6 +211,8 @@ public class WxXcxUtil { return appid_basic_car; case "yanyuan": return APPID_YANYUAN; + case "FIOT": + return APP_KEY_FIOT; default: return appid; } @@ -231,6 +236,8 @@ public class WxXcxUtil { return secret_basic_car; case "yanyuan": return SECRET_YANYUAN; + case "FIOT": + return APP_SECRET_FIOT; default: return secret; }