From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +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/CatalogApi.java | 61 +-----------------------------
1 files changed, 3 insertions(+), 58 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/CatalogApi.java b/server/web/src/main/java/com/doumee/api/web/CatalogApi.java
index 6401f59..282a6a4 100644
--- a/server/web/src/main/java/com/doumee/api/web/CatalogApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CatalogApi.java
@@ -1,21 +1,12 @@
package com.doumee.api.web;
-import com.doumee.config.annotation.UserLoginRequired;
+import com.doumee.biz.zbom.ZbomZhongTaiService;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.dao.business.model.SmsEmail;
-import com.doumee.dao.web.response.AccountResponse;
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.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
@@ -27,60 +18,14 @@
@Api(tags = "鍒嗙被鍜屾爣绛剧浉鍏虫帴鍙�")
@Trace(exclude = true)
@RestController
-@RequestMapping("/web/personnel")
+@RequestMapping("/web/catalog")
@Slf4j
public class CatalogApi extends ApiController{
@Autowired
- public UsersService usersService;
+ public ZbomZhongTaiService zbomZhongTaiService;
@Autowired
public SmsEmailService smsEmailService;
-
-
- @ApiOperation(value = "灏忕▼搴忕櫥闄�", notes = "鍛樺伐绔皬绋嬪簭")
- @GetMapping("/loginByWx")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true),
- })
- public ApiResponse<AccountResponse> loginByWx(@RequestParam String code) {
- return ApiResponse.success(usersService.wxLogin(code));
- }
-
- @ApiOperation(value = "鍙戦�佺煭淇￠獙璇佺爜", notes = "鍛樺伐绔皬绋嬪簭")
- @GetMapping("/sendSms")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "phone", value = "鎵嬫満鍙�", required = true),
- })
- public ApiResponse sendSms(@RequestParam String phone) {
- SmsEmail smsEmail = new SmsEmail();
- smsEmail.setPhone(phone);
- smsEmailService.sendSms(smsEmail);
- return ApiResponse.success("鍙戦�佹垚鍔�");
- }
-
-
-
- @ApiOperation(value = "鎵嬫満鍙烽獙璇佺爜鐧婚檰", notes = "鍛樺伐绔皬绋嬪簭")
- @GetMapping("/loginByPhone")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "phone", value = "鎵嬫満鍙�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "鐭俊楠岃瘉鐮�", required = true),
- })
- public ApiResponse<AccountResponse> loginByPhone(@RequestParam String phone,@RequestParam String code) {
- return ApiResponse.success(usersService.phoneLogin(phone,code));
- }
-
-
- @UserLoginRequired
- @ApiOperation(value = "缁戝畾openid", notes = "鍛樺伐绔皬绋嬪簭")
- @GetMapping("/bindingOpenid")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true),
- })
- public ApiResponse bindingOpenid(@RequestParam String code) {
- usersService.bindingOpenid(code,getMemberId());
- return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
}
--
Gitblit v1.9.3