From 997036b27927bcc1e9207a40b7a69c106a10f30c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 31 七月 2024 15:49:52 +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 | 81 +++++++++++++++++++++++++++++++++++++---
1 files changed, 75 insertions(+), 6 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 4a534ad..f7a4f73 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
@@ -1,27 +1,46 @@
package com.doumee.api.web;
+import cn.hutool.http.HttpRequest;
+import com.amazonaws.util.Md5Utils;
+import com.doumee.biz.system.SystemDataPermissionBiz;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.biz.zbom.ZbomCRMService;
import com.doumee.biz.zbom.ZbomZhongTaiService;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.config.annotation.UserLoginRequired;
+import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.annotation.trace.Trace;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
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.web.reqeust.GenerateQRCodeRequest;
import com.doumee.dao.web.response.DailyUpdatesResponse;
import com.doumee.dao.web.response.ZSZXCatalogResponse;
import com.doumee.service.business.GetZhongTaiDataService;
import com.doumee.service.business.NewsService;
import com.doumee.service.business.SmsEmailService;
+import com.doumee.service.business.UsersService;
import io.swagger.annotations.Api;
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.codec.digest.Md5Crypt;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.tomcat.util.security.MD5Encoder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
/**
* Created by IntelliJ IDEA.
@@ -51,33 +70,50 @@
@Autowired
public GetZhongTaiDataService getZhongTaiDataService;
+ @Autowired
+ public UsersService usersService;
+ @Autowired
+ public SystemDictDataBiz systemDictDataBiz;
+
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "銆怌绔皬绋嬪簭銆戣幏鍙栭椤靛織璇磋淇洓涓ā鍧楃被鐩暟鎹�", notes = "鑾峰彇棣栭〉蹇楄瑁呬慨鍥涗釜妯″潡绫荤洰鏁版嵁锛岃儗鏅浘鏆傛椂鍐欐锛屽弬鑰僓I")
@PostMapping("/getZSZXCatalogs")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
public ApiResponse<ZSZXCatalogResponse> getZSZXCatalogs() {
- return ApiResponse.success(getZhongTaiDataService.getZSZXCatalogs(getMemberId()));
+ return ApiResponse.success(getZhongTaiDataService.getZSZXCatalogs(getMemberId(),getUserType()));
}
+
+
+
+ @UserLoginRequired
@ApiOperation(value = "銆怋绔皬绋嬪簭銆戞瘡鏃ヤ笂鏂版暟鎹�")
@GetMapping("/getDailyUpdates")
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "fileType", value = "闄勪欢绫诲瀷 0鍥剧墖 1瑙嗛", required = false)
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
- public ApiResponse<DailyUpdatesResponse> getDailyUpdates(Integer fileType) {
- return ApiResponse.success(newsService.getDailyUpdatesResponse(fileType));
+ public ApiResponse<DailyUpdatesResponse> getDailyUpdates() {
+ return ApiResponse.success(newsService.getDailyUpdatesResponse());
}
+ @UserLoginRequired
@ApiOperation("銆怋绔皬绋嬪簭銆� 鎺ㄥ箍鍜ㄨ鍒嗛〉")
@PostMapping("/newsPage")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
public ApiResponse<PageData<News>> newsPage (@RequestBody PageWrap<News> pageWrap) {
+ pageWrap.getModel().setIsPublish(Constants.ONE);
return ApiResponse.success(newsService.findPage(pageWrap));
}
-
-
@UserLoginRequired
@ApiOperation(value = "鑾峰彇瀹㈡埛绠＄悊鎺堟潈-鍒楄〃璺宠浆鍦板潃", notes = "鑾峰彇瀹㈡埛绠＄悊鎺堟潈璺宠浆鍦板潃")
@@ -89,4 +125,37 @@
public ApiResponse<String> getCrmAuthUrl(@RequestParam Integer type) {
return ApiResponse.success(zbomCRMService.getCrmGoUrl(this.getLoginUserInfo().getIamUsername(),type));
}
+
+ @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