From 597d26b944e1d8bd5772d1f9fac5ec92ba7d592a Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 27 九月 2024 15:40:42 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java | 43 +++++--------------------------------------
1 files changed, 5 insertions(+), 38 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java b/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java
index 0e4ab81..4b2d588 100644
--- a/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java
@@ -13,10 +13,12 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.News;
+import com.doumee.dao.business.model.Users;
import com.doumee.dao.web.reqeust.GenerateQRCodeRequest;
import com.doumee.dao.web.response.DailyUpdatesResponse;
import com.doumee.dao.web.response.ZSZXCatalogResponse;
@@ -89,10 +91,6 @@
}
-
-
-
-
@UserLoginRequired
@ApiOperation(value = "銆怋绔皬绋嬪簭銆戞瘡鏃ヤ笂鏂版暟鎹�")
@GetMapping("/getDailyUpdates")
@@ -112,10 +110,9 @@
})
public ApiResponse<PageData<News>> newsPage (@RequestBody PageWrap<News> pageWrap) {
pageWrap.getModel().setIsPublish(Constants.ONE);
+ pageWrap.getModel().setStatus(Constants.ZERO);
return ApiResponse.success(newsService.findPage(pageWrap));
}
-
-
@UserLoginRequired
@ApiOperation(value = "鑾峰彇瀹㈡埛绠＄悊鎺堟潈-鍒楄〃璺宠浆鍦板潃", notes = "鑾峰彇瀹㈡埛绠＄悊鎺堟潈璺宠浆鍦板潃")
@@ -125,39 +122,9 @@
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "绫诲瀷 0瀹㈡埛鍒楄〃 1璺宠浆鏂板鎰忓悜瀹㈡埛", required = true)
})
public ApiResponse<String> getCrmAuthUrl(@RequestParam Integer type) {
- return ApiResponse.success(zbomCRMService.getCrmGoUrl(this.getLoginUserInfo().getIamUsername(),type));
+ Users users = this.getLoginUserInfo();
+ return ApiResponse.success(zbomCRMService.getCrmGoUrl(users.getIamUsername(),type,users.getIamId()));
}
- @PreventRepeat(lockTime = 2000)
- @ApiOperation(value = "鐢熸垚灏忕▼搴忕爜", notes = "PAD绔�")
- @PostMapping("/getQrCode")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "sign", value = "绛惧悕锛堜娇鐢╰imestamp+appkey杩涜md5鍔犲瘑锛�", required = true),
- @ApiImplicitParam(paramType = "header", dataType = "Long", name = "timestamp", value = "鏃堕棿鎴筹紙褰撳墠鏃堕棿姣锛�2灏忔椂鍐呮湁鏁堬級", required = true),
- })
- public void getQrCode(@RequestParam(value = "sign")String sign,
- @RequestParam(value = "timestamp")Long timestamp,
- @RequestBody GenerateQRCodeRequest generateQRCodeRequest,HttpServletResponse response) {
- if(StringUtils.isBlank(sign) || timestamp == null){
- throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
- String interfaceKey = systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_PAD_INTERFACE_KEY).getCode();
- //鍒ゆ柇鏃堕棿鎴虫槸鍚﹁秴杩囦袱灏忔椂
- if(System.currentTimeMillis()-timestamp > 2 * 60 * 3600 * 1000){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"token宸插け鏁�!");
- }
- String token = DigestUtils.md5Hex(timestamp+interfaceKey);
- if(!token.equals(sign)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"token宸插け鏁�!");
- }
- try{
- response.setHeader("Cache-Control", "no-store, no-cache");
- response.setContentType("image/jpeg");
- InputStream inputStream = usersService.getQrCode(generateQRCodeRequest);
- ImageIO.write(ImageIO.read(inputStream),"png",response.getOutputStream());
- }catch (Exception e){
- e.printStackTrace();
- }
- }
}
--
Gitblit v1.9.3