From 3a355771834c39d38a628132031ce1c52bc64478 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 17 七月 2024 18:25:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/web/src/main/java/com/doumee/api/web/PersonnelApi.java | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
index 9b6eb64..3ffb695 100644
--- a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
@@ -104,7 +104,7 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true),
})
public ApiResponse bindingOpenid(@RequestParam String code) {
- usersService.bindingOpenid(code,getMemberId());
+ usersService.bindingOpenid(code,getUserId());
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -115,7 +115,7 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
public ApiResponse getUserDetail() {
- usersService.usersDetailById(getMemberId());
+ usersService.usersDetailById(getUserId());
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -126,7 +126,7 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
public ApiResponse editUsers(@RequestBody EditUsersRequest editUsersRequest) {
- editUsersRequest.setUserId(getMemberId());
+ editUsersRequest.setUserId(getUserId());
usersService.editUserInfo(editUsersRequest);
return ApiResponse.success("鏇存柊鎴愬姛");
}
@@ -213,16 +213,6 @@
return ApiResponse.success("鏌ヨ鎴愬姛",ztTagInfoResponseList);
}
- @LoginRequired
- @ApiOperation(value = "鏍囩鏁版嵁 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
- @PostMapping("/getZTCatalogInfoResponse")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
- })
- public ApiResponse<List<ZTCatalogInfoResponse>> getZTCatalogInfoResponse(@RequestBody ZTCatalogListRequest ztCatalogListRequest) {
- List<ZTCatalogInfoResponse> ztCatalogInfoResponse = getZhongTaiDataService.getZTCatalogInfoResponse(ztCatalogListRequest);
- return ApiResponse.success("鏌ヨ鎴愬姛",ztCatalogInfoResponse);
- }
@LoginRequired
@ApiOperation(value = "鍐呭鍒嗛〉 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@@ -243,7 +233,7 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
})
public ApiResponse<ZTContentInfoResponse> getContentInfo(@RequestParam String id) {
- ZTContentInfoResponse ztContentInfoResponse= getZhongTaiDataService.getContentInfo(id,Constants.BUSINESS,getMemberId());
+ ZTContentInfoResponse ztContentInfoResponse= getZhongTaiDataService.getContentInfo(id,Constants.BUSINESS,getUserId());
return ApiResponse.success("鏌ヨ鎴愬姛",ztContentInfoResponse);
}
@@ -256,7 +246,7 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
})
public ApiResponse collectContent(@RequestParam String id) {
- getZhongTaiDataService.collectContent(getMemberId(),Constants.BUSINESS,id);
+ getZhongTaiDataService.collectContent(getUserId(),Constants.BUSINESS,id);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -268,7 +258,7 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
})
public ApiResponse likeContent(@RequestParam String id) {
- getZhongTaiDataService.likeContent(getMemberId(),Constants.BUSINESS,id);
+ getZhongTaiDataService.likeContent(getUserId(),Constants.BUSINESS,id);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -281,7 +271,7 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
})
public ApiResponse shareContent(@RequestParam String id) {
- getZhongTaiDataService.shareContent(getMemberId(),Constants.BUSINESS,id);
+ getZhongTaiDataService.shareContent(getUserId(),Constants.BUSINESS,id);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -294,7 +284,7 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
})
public ApiResponse viewContent(@RequestParam String id) {
- getZhongTaiDataService.viewContent(getMemberId(),Constants.BUSINESS,id);
+ getZhongTaiDataService.viewContent(getUserId(),Constants.BUSINESS,id);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.9.3