From 8962a6aecb9922a016155af8fa5a09d727c78c70 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 31 十二月 2024 15:45:00 +0800
Subject: [PATCH] 修改
---
applet/src/main/java/com/jilongda/applet/utils/LoginInfoUtil.java | 6 +++---
common/src/main/java/com/jilongda/common/basic/Constant.java | 2 +-
applet/src/main/resources/application.yml | 7 ++++---
optometrist/src/main/resources/application.yml | 3 ++-
applet/src/main/java/com/jilongda/applet/controller/LoginController.java | 21 ++++++++++-----------
manage/src/main/resources/application.yml | 3 ++-
6 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/applet/src/main/java/com/jilongda/applet/controller/LoginController.java b/applet/src/main/java/com/jilongda/applet/controller/LoginController.java
index e379fbf..ccb8cbd 100644
--- a/applet/src/main/java/com/jilongda/applet/controller/LoginController.java
+++ b/applet/src/main/java/com/jilongda/applet/controller/LoginController.java
@@ -54,17 +54,16 @@
@PostMapping("openIdByJsCode")
public ApiResult<Map<String, Object>> openIdByJsCode(@RequestBody AppletUserEncrypteData data) {
log.info("<<<<<<<<换取openid开始<<<<<<<<:{}", data.getCode());
-// WxAppletTools appletTools = new WxAppletTools(wxRestTemplate, wxConfig, redisAutoTemplate);
-// Code2SessionRespBody body = appletTools.getOpenIdByJscode2session(new Code2SessionResqBody().build(data.getCode()));
-// String openid = body.getOpenid();
-// String sessionKey = body.getSessionKey();
-// if(!StringUtils.hasLength(data.getEncryptedData()) || !StringUtils.hasLength(data.getIv())){
-// return ApiResult.failed("已拒绝授权",null);
-// }
-// AppletUserDecodeData appletUserDecodeData = WxUtils.encryptedData(data.getEncryptedData(), sessionKey, data.getIv());
-// appletUserDecodeData.setOpenId(openid);
-// TAppUser appUser = appUserService.wxLogin(appletUserDecodeData);
- TAppUser appUser = appUserService.getById(1);
+ WxAppletTools appletTools = new WxAppletTools(wxRestTemplate, wxConfig, redisAutoTemplate);
+ Code2SessionRespBody body = appletTools.getOpenIdByJscode2session(new Code2SessionResqBody().build(data.getCode()));
+ String openid = body.getOpenid();
+ String sessionKey = body.getSessionKey();
+ if(!StringUtils.hasLength(data.getEncryptedData()) || !StringUtils.hasLength(data.getIv())){
+ return ApiResult.failed("已拒绝授权",null);
+ }
+ AppletUserDecodeData appletUserDecodeData = WxUtils.encryptedData(data.getEncryptedData(), sessionKey, data.getIv());
+ appletUserDecodeData.setOpenId(openid);
+ TAppUser appUser = appUserService.wxLogin(appletUserDecodeData);
Map<String, Object> tokenInfos = securityUtils.login(appUser.getOpenId(), appUser, authenticationManager, TAppUser.class, 3);
return ApiResult.success(tokenInfos);
}
diff --git a/applet/src/main/java/com/jilongda/applet/utils/LoginInfoUtil.java b/applet/src/main/java/com/jilongda/applet/utils/LoginInfoUtil.java
index fc4e046..512ec86 100644
--- a/applet/src/main/java/com/jilongda/applet/utils/LoginInfoUtil.java
+++ b/applet/src/main/java/com/jilongda/applet/utils/LoginInfoUtil.java
@@ -16,9 +16,9 @@
public Integer getUserId(){
-// String username = JwtTokenUtils.getUsername();
-// TAppUser appUser = appUserService.getOne(new QueryWrapper<TAppUser>().eq("openId", username).eq("isDelete",0));
- return 1;
+ String username = JwtTokenUtils.getUsername();
+ TAppUser appUser = appUserService.getOne(new QueryWrapper<TAppUser>().eq("openId", username).eq("isDelete",0));
+ return appUser.getId();
}
public TAppUser getLoginUser(){
diff --git a/applet/src/main/resources/application.yml b/applet/src/main/resources/application.yml
index ab54239..0ed5237 100644
--- a/applet/src/main/resources/application.yml
+++ b/applet/src/main/resources/application.yml
@@ -13,7 +13,8 @@
max-request-size: 500MB
resolve-lazily: true #设置为懒加载，不然依然会捕获不到异常
profiles:
- active: prod
+ active: dev
+ # active: prod
main:
allow-bean-definition-overriding: true
# rabbitmq:
@@ -66,8 +67,8 @@
conf:
# 开启或关闭，默认开启，当支付信息无效时不能正常启动项目，可设为false
enabled: true
- appId: wxb17e909bb2b1975f
- secretId: eee8aae16bab075f1b3e51784e5dff6d
+ appId: wx9368902cab914aea
+ secretId: 1ec8263ae9ed9f475546c971fc702979
templateApproveId: jAt2UR8LtaDplqwHQFmAjvaqdLY0WVo16CVYKoZtcuo #申请审批消息模板id
#OSS及短信配置
oss:
diff --git a/common/src/main/java/com/jilongda/common/basic/Constant.java b/common/src/main/java/com/jilongda/common/basic/Constant.java
index 47bcfc3..bcc3d59 100644
--- a/common/src/main/java/com/jilongda/common/basic/Constant.java
+++ b/common/src/main/java/com/jilongda/common/basic/Constant.java
@@ -124,7 +124,7 @@
, "/api/v1/"
, "/druid/**"
, "/druid/**"
- , "/**" //开发时关闭身份认证
+// , "/**" //开发时关闭身份认证
, "/files/**"
, "/login"
, "/wx/wxLoginByCodeH5" //微信h5登录
diff --git a/manage/src/main/resources/application.yml b/manage/src/main/resources/application.yml
index 64830a9..fbf574b 100644
--- a/manage/src/main/resources/application.yml
+++ b/manage/src/main/resources/application.yml
@@ -13,7 +13,8 @@
max-request-size: 500MB
resolve-lazily: true #设置为懒加载，不然依然会捕获不到异常
profiles:
- active: prod
+ active: dev
+ # active: prod
main:
allow-bean-definition-overriding: true
#sagger文档属性配置
diff --git a/optometrist/src/main/resources/application.yml b/optometrist/src/main/resources/application.yml
index 81f15b9..7bce5a1 100644
--- a/optometrist/src/main/resources/application.yml
+++ b/optometrist/src/main/resources/application.yml
@@ -13,7 +13,8 @@
max-request-size: 500MB
resolve-lazily: true #设置为懒加载，不然依然会捕获不到异常
profiles:
- active: prod
+ active: dev
+# active: prod
main:
allow-bean-definition-overriding: true
#sagger文档属性配置
--
Gitblit v1.7.1