From a9eccf12bba4075ecb6ffe9650826ce6127bbe82 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 八月 2024 10:20:53 +0800
Subject: [PATCH] aa
---
server/admin/src/main/java/com/doumee/api/business/PushController.java | 9 +++++++++
server/web/src/main/java/com/doumee/api/ScheduleTool.java | 6 ++----
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 5 ++---
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/server/admin/src/main/java/com/doumee/api/business/PushController.java b/server/admin/src/main/java/com/doumee/api/business/PushController.java
index 4ff9a10..8aff700 100644
--- a/server/admin/src/main/java/com/doumee/api/business/PushController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/PushController.java
@@ -18,6 +18,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +36,7 @@
*/
@Api(tags = "瀵瑰銆怚AM銆丳AD绔�戞帹閫佹彁渚涙帴鍙�")
@RestController
+@Slf4j
@RequestMapping("/push")
public class PushController extends BaseController {
@Autowired
@@ -56,9 +58,11 @@
zbomIAMService.updateShopInfo(token,uuid,timestamp,shopList);
r = ApiResponse.successIam("鎿嶄綔鎴愬姛");
}catch (BusinessException e){
+ log.error("銆怚AM銆戠粍缁囦俊鎭洿鏂版帹閫�===澶辫触锛�"+e.getMessage());
success = Constants.ONE;
r = ApiResponse.failed(StringUtils.defaultString(e.getMessage(),"鎿嶄綔澶辫触"));
}catch (Exception e){
+ log.error("銆怚AM銆戠粍缁囦俊鎭洿鏂版帹閫�===澶辫触锛�"+e.getMessage());
e.printStackTrace();
success = Constants.ONE;
r = ApiResponse.failed("鎿嶄綔澶辫触");
@@ -80,9 +84,11 @@
zbomIAMService.updateUserInfo(token,uuid,timestamp,upateUserModel);
r = ApiResponse.successIam("鎿嶄綔鎴愬姛");
}catch (BusinessException e){
+ log.error("銆怚AM銆戜汉鍛樿处鍙蜂俊鎭洿鏂版帹閫�===澶辫触锛�"+e.getMessage());
success = Constants.ONE;
r = ApiResponse.failed(StringUtils.defaultString(e.getMessage(),"鎿嶄綔澶辫触"));
}catch (Exception e){
+ log.error("銆怚AM銆戜汉鍛樿处鍙蜂俊鎭洿鏂版帹閫�===澶辫触锛�"+e.getMessage());
success = Constants.ONE;
e.getMessage();
r = ApiResponse.failed("鎿嶄綔澶辫触");
@@ -104,9 +110,11 @@
zbomIAMService.updateRoleInfo(token,uuid,timestamp,upateModel);
r = ApiResponse.successIam("鎿嶄綔鎴愬姛");
}catch (BusinessException e){
+ log.error("銆怚AM銆戣鑹蹭俊鎭洿鏂版帹閫�===澶辫触锛�"+e.getMessage());
success = Constants.ONE;
r = ApiResponse.failed(StringUtils.defaultString(e.getMessage(),"鎿嶄綔澶辫触"));
}catch (Exception e){
+ log.error("銆怚AM銆戣鑹蹭俊鎭洿鏂版帹閫�===澶辫触锛�"+e.getMessage());
success = Constants.ONE;
e.getMessage();
r = ApiResponse.failed("鎿嶄綔澶辫触");
@@ -144,6 +152,7 @@
InputStream inputStream = usersService.getQrCode(generateQRCodeRequest);
ImageIO.write(ImageIO.read(inputStream),"png",response.getOutputStream());
}catch (Exception e){
+ log.error("鐢熸垚娑堣垂鑰匔绔皬绋嬪簭鐮�===澶辫触锛�"+e.getMessage());
e.printStackTrace();
}
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 0ed0e1a..4c43371 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -336,7 +336,6 @@
public AccountResponse testLogin(String openid){
String openId = openid;
Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId));
-
if (member == null) {
member = new Member();
member.setNickname("寰俊鐢ㄦ埛"+ CodeVerifyUtils.createVerificationCode(4));
@@ -577,7 +576,7 @@
}
- public ZTUserGetTokenResponse syncZhongTaiUser(Member member){
+ public static ZTUserGetTokenResponse syncZhongTaiUserNew(Member member,SystemDictDataBiz systemDictDataBiz,ZbomZhongTaiService zbomZhongTaiService){
ZTUserInfoUpdateRequest ztUserInfoUpdateRequest = new ZTUserInfoUpdateRequest();
ztUserInfoUpdateRequest.setOpenId(member.getOpenid());
String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
@@ -605,7 +604,7 @@
ZTUserGetTokenResponse ztUserGetTokenResponse = (ZTUserGetTokenResponse) userUpdateInfo.getData();
return ztUserGetTokenResponse;
}
- public static ZTUserGetTokenResponse syncZhongTaiUserNew(Member member,SystemDictDataBiz systemDictDataBiz,ZbomZhongTaiService zbomZhongTaiService){
+ public ZTUserGetTokenResponse syncZhongTaiUser(Member member){
ZTUserInfoUpdateRequest ztUserInfoUpdateRequest = new ZTUserInfoUpdateRequest();
ztUserInfoUpdateRequest.setOpenId(member.getOpenid());
String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
diff --git a/server/web/src/main/java/com/doumee/api/ScheduleTool.java b/server/web/src/main/java/com/doumee/api/ScheduleTool.java
index 7923406..8fbf500 100644
--- a/server/web/src/main/java/com/doumee/api/ScheduleTool.java
+++ b/server/web/src/main/java/com/doumee/api/ScheduleTool.java
@@ -34,11 +34,10 @@
* @date 2021-10-10 14:40:35
* https://www.bejson.com/othertools/cron/ cron 琛ㄨ揪寮忕敓鎴愬湴鍧�
*/
-//@Component
-//@EnableScheduling
+@Component
+@EnableScheduling
@Slf4j
public class ScheduleTool {
-
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -49,7 +48,6 @@
*/
@Value("${debug_model}")
private Boolean timing;
-
--
Gitblit v1.9.3