commit 76cc4d9696417fe6468de504e16b22b4f78fbde5
Author: 十月 <37159168@qq.com>
Date: Fri Nov 17 21:25:59 2023 +0800
第二次8888
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..06c272d
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..132404b
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/bwie-auth/pom.xml b/bwie-auth/pom.xml
new file mode 100644
index 0000000..81912f9
--- /dev/null
+++ b/bwie-auth/pom.xml
@@ -0,0 +1,31 @@
+
+
+ 4.0.0
+
+ com.bwie
+ boot1117
+ 1.0-SNAPSHOT
+
+
+ bwie-auth
+
+
+ 8
+ 8
+ UTF-8
+
+
+
+
+ com.bwie
+ bwie-common
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
diff --git a/bwie-auth/src/main/java/com/bwie/auth/AuthApplication.java b/bwie-auth/src/main/java/com/bwie/auth/AuthApplication.java
new file mode 100644
index 0000000..74f582d
--- /dev/null
+++ b/bwie-auth/src/main/java/com/bwie/auth/AuthApplication.java
@@ -0,0 +1,13 @@
+package com.bwie.auth;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+@SpringBootApplication
+@EnableFeignClients
+public class AuthApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(AuthApplication.class);
+ }
+}
diff --git a/bwie-auth/src/main/java/com/bwie/auth/controller/AuthController.java b/bwie-auth/src/main/java/com/bwie/auth/controller/AuthController.java
new file mode 100644
index 0000000..5dc69e0
--- /dev/null
+++ b/bwie-auth/src/main/java/com/bwie/auth/controller/AuthController.java
@@ -0,0 +1,57 @@
+package com.bwie.auth.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.bwie.auth.service.AuthService;
+import com.bwie.common.domain.User;
+import com.bwie.common.domain.response.JwtResponse;
+import com.bwie.common.result.Result;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@Log4j2
+public class AuthController {
+
+ @Autowired
+ private AuthService authService;
+ @Autowired
+ private HttpServletRequest request;
+
+ /**
+ * 根据用户名登录
+ * @param user
+ * @return
+ */
+ @PostMapping("/login")
+ public Result login(@RequestBody User user){
+ log.info("功能名称:根据用户名登录,请求URI:{},请求方式:{},请求参数:{}",request.getRequestURI(),
+ request.getMethod(), JSONObject.toJSONString(user));
+ Result result=authService.login(user);
+ log.info("功能名称:根据用户名登录,请求URI:{},请求方式:{},响应参数:{}",request.getRequestURI(),
+ request.getMethod(), JSONObject.toJSONString(result));
+ return result;
+ }
+
+ /**
+ * 获取登录人信息
+ * @return
+ */
+ @GetMapping("/user/info")
+ public Result userInfo(){
+ log.info("功能名称:获取登录人信息,请求URI:{},请求方式:{}",request.getRequestURI(),
+ request.getMethod());
+ User user=authService.userInfo();
+ Result result = Result.success(user);
+ log.info("功能名称:获取登录人信息,请求URI:{},请求方式:{},响应参数:{}",request.getRequestURI(),
+ request.getMethod(), JSONObject.toJSONString(result));
+ return result;
+ }
+
+}
diff --git a/bwie-auth/src/main/java/com/bwie/auth/feign/FeignService.java b/bwie-auth/src/main/java/com/bwie/auth/feign/FeignService.java
new file mode 100644
index 0000000..6a0f12b
--- /dev/null
+++ b/bwie-auth/src/main/java/com/bwie/auth/feign/FeignService.java
@@ -0,0 +1,15 @@
+package com.bwie.auth.feign;
+
+import com.bwie.common.domain.User;
+import com.bwie.common.result.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@FeignClient(value = "bwie-system")
+public interface FeignService {
+
+ @PostMapping("/user/findByUserName")
+ public Result findByUserName(@RequestBody User user);
+
+}
diff --git a/bwie-auth/src/main/java/com/bwie/auth/service/AuthService.java b/bwie-auth/src/main/java/com/bwie/auth/service/AuthService.java
new file mode 100644
index 0000000..5b13820
--- /dev/null
+++ b/bwie-auth/src/main/java/com/bwie/auth/service/AuthService.java
@@ -0,0 +1,12 @@
+package com.bwie.auth.service;
+
+import com.bwie.common.domain.User;
+import com.bwie.common.domain.response.JwtResponse;
+import com.bwie.common.result.Result;
+
+public interface AuthService {
+ Result login(User user);
+
+ User userInfo();
+
+}
diff --git a/bwie-auth/src/main/java/com/bwie/auth/service/impl/AuthServiceImpl.java b/bwie-auth/src/main/java/com/bwie/auth/service/impl/AuthServiceImpl.java
new file mode 100644
index 0000000..56c299a
--- /dev/null
+++ b/bwie-auth/src/main/java/com/bwie/auth/service/impl/AuthServiceImpl.java
@@ -0,0 +1,67 @@
+package com.bwie.auth.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.bwie.auth.feign.FeignService;
+import com.bwie.auth.service.AuthService;
+import com.bwie.common.constants.JwtConstants;
+import com.bwie.common.constants.TokenConstants;
+import com.bwie.common.domain.User;
+import com.bwie.common.domain.response.JwtResponse;
+import com.bwie.common.result.Result;
+import com.bwie.common.utils.JwtUtils;
+import com.bwie.common.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Handler;
+
+@Service
+public class AuthServiceImpl implements AuthService {
+
+ @Autowired
+ private FeignService feignService;
+ @Autowired
+ private RedisTemplate redisTemplate;
+ @Autowired
+ private HttpServletRequest request;
+
+ @Override
+ public Result login(User user) {
+ Result byUserName = feignService.findByUserName(user);
+ User data = byUserName.getData();
+ if(data==null){
+ return Result.error("用户不存在,请注册");
+ }
+ if(StringUtils.isAllBlank(user.getUserName(),user.getUserPwd())){
+ return Result.error("用户名或密码不能为空");
+ }
+ if(!user.getUserPwd().equals(data.getUserPwd())){
+ return Result.error("密码错误");
+ }
+ String s = UUID.randomUUID().toString().replaceAll("-", "");
+ HashMap map = new HashMap<>();
+ map.put(JwtConstants.USER_KEY,s);
+ String token = JwtUtils.createToken(map);
+
+ redisTemplate.opsForValue().set(TokenConstants.LOGIN_TOKEN_KEY+s, JSONObject.toJSONString(data),15, TimeUnit.MINUTES);
+
+ JwtResponse jwtResponse = new JwtResponse();
+ jwtResponse.setToken(token);
+ jwtResponse.setExpireTime("15MIN");
+
+ return Result.success(jwtResponse);
+ }
+
+ @Override
+ public User userInfo() {
+ String header = request.getHeader(TokenConstants.TOKEN);
+ String userKey = JwtUtils.getUserKey(header);
+ String s = redisTemplate.opsForValue().get(TokenConstants.LOGIN_TOKEN_KEY + userKey);
+ return JSONObject.parseObject(s,User.class);
+ }
+}
diff --git a/bwie-auth/src/main/resources/bootstrap.yml b/bwie-auth/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..e08643f
--- /dev/null
+++ b/bwie-auth/src/main/resources/bootstrap.yml
@@ -0,0 +1,45 @@
+# Tomcat
+server:
+ port: 9001
+# Spring
+spring:
+ main:
+ allow-circular-references: true
+ jackson:
+ date-format: yyyy-MM-dd HH:mm:ss
+ time-zone: GMT+8
+ application:
+ # 应用名称
+ name: bwie-auth
+ profiles:
+ # 环境配置
+ active: dev
+ rabbitmq:
+ host: 101.34.249.114
+ port: 5672
+ username: guest
+ password: guest
+ virtualHost: /
+ listener:
+ simple:
+ prefetch: 1
+ acknowledge-mode: manual
+ retry:
+ enabled:true
+ publisher-confirm-type: correlated
+ publisher-returns: true
+ cloud:
+ nacos:
+ discovery:
+ # 服务注册地址
+ server-addr: 101.34.249.114:8848
+ namespace: a1303f6e-570b-4f04-b78e-cab8002a3ce6
+ config:
+ # 配置中心地址
+ server-addr: 101.34.249.114:8848
+ namespace: a1303f6e-570b-4f04-b78e-cab8002a3ce6
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/bwie-common/pom.xml b/bwie-common/pom.xml
new file mode 100644
index 0000000..46bdf34
--- /dev/null
+++ b/bwie-common/pom.xml
@@ -0,0 +1,118 @@
+
+
+ 4.0.0
+
+ com.bwie
+ boot1117
+ 1.0-SNAPSHOT
+
+
+ bwie-common
+
+
+ 8
+ 8
+ UTF-8
+
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter-bootstrap
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-sentinel
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter-loadbalancer
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter-openfeign
+
+
+
+ io.jsonwebtoken
+ jjwt
+ 0.9.1
+
+
+
+ com.alibaba
+ fastjson
+ 1.2.80
+
+
+
+ org.springframework.boot
+ spring-boot-starter-data-redis
+
+
+
+ org.springframework.boot
+ spring-boot-starter-validation
+
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+ org.projectlombok
+ lombok
+
+
+
+ cn.hutool
+ hutool-all
+ 5.8.3
+
+
+
+ com.aliyun
+ dysmsapi20170525
+ 2.0.1
+
+
+
+ com.aliyun.oss
+ aliyun-sdk-oss
+ 3.12.0
+
+
+
+
+
+
+
+
diff --git a/bwie-common/src/main/java/com/bwie/common/constants/Constants.java b/bwie-common/src/main/java/com/bwie/common/constants/Constants.java
new file mode 100644
index 0000000..aa95072
--- /dev/null
+++ b/bwie-common/src/main/java/com/bwie/common/constants/Constants.java
@@ -0,0 +1,18 @@
+package com.bwie.common.constants;
+
+/**
+ * @description: 系统常量
+ * @author
+ */
+public class Constants {
+ /**
+ * 成功标记
+ */
+ public static final Integer SUCCESS = 200;
+ public static final String SUCCESS_MSG = "操作成功";
+ /**
+ * 失败标记
+ */
+ public static final Integer ERROR = 500;
+ public static final String ERROR_MSG = "操作异常";
+}
diff --git a/bwie-common/src/main/java/com/bwie/common/constants/JwtConstants.java b/bwie-common/src/main/java/com/bwie/common/constants/JwtConstants.java
new file mode 100644
index 0000000..996e06c
--- /dev/null
+++ b/bwie-common/src/main/java/com/bwie/common/constants/JwtConstants.java
@@ -0,0 +1,29 @@
+package com.bwie.common.constants;
+
+/**
+ * @author
+ * @description: Jwt常量
+ */
+public class JwtConstants {
+
+ /**
+ * 用户ID字段
+ */
+ public static final String DETAILS_USER_ID = "user_id";
+
+ /**
+ * 用户名字段
+ */
+ public static final String DETAILS_USERNAME = "username";
+
+ /**
+ * 用户标识
+ */
+ public static final String USER_KEY = "user_key";
+
+ /**
+ * 令牌秘钥
+ */
+ public final static String SECRET = "abcdefghijklmnopqrstuvwxyz";
+
+}
diff --git a/bwie-common/src/main/java/com/bwie/common/constants/TokenConstants.java b/bwie-common/src/main/java/com/bwie/common/constants/TokenConstants.java
new file mode 100644
index 0000000..521912f
--- /dev/null
+++ b/bwie-common/src/main/java/com/bwie/common/constants/TokenConstants.java
@@ -0,0 +1,24 @@
+package com.bwie.common.constants;
+
+/**
+ * @author
+ * @description: 令牌常量
+ */
+public class TokenConstants {
+ /**
+ * 缓存有效期,默认720(分钟)
+ */
+ public final static long EXPIRATION = 720;
+ /**
+ * 缓存刷新时间,默认120(分钟)
+ */
+ public final static long REFRESH_TIME = 120;
+ /**
+ * 权限缓存前缀
+ */
+ public final static String LOGIN_TOKEN_KEY = "login_tokens:";
+ /**
+ * token标识
+ */
+ public static final String TOKEN = "token";
+}
diff --git a/bwie-common/src/main/java/com/bwie/common/domain/Merch.java b/bwie-common/src/main/java/com/bwie/common/domain/Merch.java
new file mode 100644
index 0000000..51c2fff
--- /dev/null
+++ b/bwie-common/src/main/java/com/bwie/common/domain/Merch.java
@@ -0,0 +1,31 @@
+package com.bwie.common.domain;
+
+import lombok.Data;
+
+import java.util.Date;
+@Data
+public class Merch {
+ //商品编号
+ private Integer merchId;
+ //商品名称
+ private String merchName;
+ //商品类型
+ private Integer typeId;
+ //价格
+ private Integer merchPrice;
+ //条形码
+ private String merchCode;
+ //促销价格
+ private Integer merchSales;
+ //厂商编号
+ private String merchFactory;
+ //供货商编号
+ private String merchProvide;
+ //过期日期
+ private Date merchTime;
+ //库存数量
+ private Integer merchNum;
+ //商品状态
+ private Integer merchFlag;
+
+}
diff --git a/bwie-common/src/main/java/com/bwie/common/domain/Role.java b/bwie-common/src/main/java/com/bwie/common/domain/Role.java
new file mode 100644
index 0000000..d5c95d6
--- /dev/null
+++ b/bwie-common/src/main/java/com/bwie/common/domain/Role.java
@@ -0,0 +1,14 @@
+package com.bwie.common.domain;
+
+import lombok.Data;
+
+@Data
+public class Role {
+
+ private Integer id;
+
+ private Integer roleId;
+
+ private String roleName;
+
+}
diff --git a/bwie-common/src/main/java/com/bwie/common/domain/User.java b/bwie-common/src/main/java/com/bwie/common/domain/User.java
new file mode 100644
index 0000000..70a641a
--- /dev/null
+++ b/bwie-common/src/main/java/com/bwie/common/domain/User.java
@@ -0,0 +1,20 @@
+package com.bwie.common.domain;
+
+import lombok.Data;
+
+@Data
+public class User {
+
+ private Integer userId;
+
+ private String userName;
+
+ private String userPwd;
+
+ private String token;
+
+ private Integer roleId;
+
+ private String roleName;
+
+}
diff --git a/bwie-common/src/main/java/com/bwie/common/domain/request/MerchRequest.java b/bwie-common/src/main/java/com/bwie/common/domain/request/MerchRequest.java
new file mode 100644
index 0000000..e2c4a53
--- /dev/null
+++ b/bwie-common/src/main/java/com/bwie/common/domain/request/MerchRequest.java
@@ -0,0 +1,14 @@
+package com.bwie.common.domain.request;
+
+import lombok.Data;
+
+@Data
+public class MerchRequest {
+
+ private String merchCode;
+
+ private Integer pageNum=1;
+
+ private Integer pageSize=5;
+
+}
diff --git a/bwie-common/src/main/java/com/bwie/common/domain/response/JwtResponse.java b/bwie-common/src/main/java/com/bwie/common/domain/response/JwtResponse.java
new file mode 100644
index 0000000..1719333
--- /dev/null
+++ b/bwie-common/src/main/java/com/bwie/common/domain/response/JwtResponse.java
@@ -0,0 +1,12 @@
+package com.bwie.common.domain.response;
+
+import lombok.Data;
+
+@Data
+public class JwtResponse {
+
+ private String token;
+
+ private String expireTime;
+
+}
diff --git a/bwie-common/src/main/java/com/bwie/common/result/PageResult.java b/bwie-common/src/main/java/com/bwie/common/result/PageResult.java
new file mode 100644
index 0000000..6ab71f7
--- /dev/null
+++ b/bwie-common/src/main/java/com/bwie/common/result/PageResult.java
@@ -0,0 +1,34 @@
+package com.bwie.common.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author
+ * @description: 列表返回结果集
+ */
+@Data
+public class PageResult implements Serializable {
+ /**
+ * 总条数
+ */
+ private long total;
+ /**
+ * 结果集合
+ */
+ private List list;
+ public PageResult() {
+ }
+ public PageResult(long total, List list) {
+ this.total = total;
+ this.list = list;
+ }
+ public static PageResult toPageResult(long total, List list){
+ return new PageResult(total , list);
+ }
+ public static Result> toResult(long total, List list){
+ return Result.success(PageResult.toPageResult(total,list));
+ }
+}
diff --git a/bwie-common/src/main/java/com/bwie/common/result/Result.java b/bwie-common/src/main/java/com/bwie/common/result/Result.java
new file mode 100644
index 0000000..6060d36
--- /dev/null
+++ b/bwie-common/src/main/java/com/bwie/common/result/Result.java
@@ -0,0 +1,76 @@
+package com.bwie.common.result;
+
+import com.bwie.common.constants.Constants;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author
+ * @description: 响应信息主体
+ */
+@Data
+public class Result implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ /**
+ * 成功
+ */
+ public static final int SUCCESS = Constants.SUCCESS;
+ /**
+ * 失败
+ */
+ public static final int FAIL = Constants.ERROR;
+ /**
+ * 返回状态码
+ */
+ private int code;
+ /**
+ * 响应信息
+ */
+ private String msg;
+ /**
+ * 响应数据
+ */
+ private T data;
+
+ public static Result success() {
+ return restResult(null, SUCCESS, Constants.SUCCESS_MSG);
+ }
+
+ public static Result success(T data) {
+ return restResult(data, SUCCESS, Constants.SUCCESS_MSG);
+ }
+
+ public static Result success(T data, String msg) {
+ return restResult(data, SUCCESS, msg);
+ }
+
+ public static Result error() {
+ return restResult(null, FAIL, Constants.ERROR_MSG);
+ }
+
+ public static Result error(String msg) {
+ return restResult(null, FAIL, msg);
+ }
+
+ public static Result error(T data) {
+ return restResult(data, FAIL, Constants.ERROR_MSG);
+ }
+
+ public static Result error(T data, String msg) {
+ return restResult(data, FAIL, msg);
+ }
+
+ public static Result error(int code, String msg) {
+ return restResult(null, code, msg);
+ }
+
+ private static Result restResult(T data, int code, String msg) {
+ Result apiResult = new Result<>();
+ apiResult.setCode(code);
+ apiResult.setData(data);
+ apiResult.setMsg(msg);
+ return apiResult;
+ }
+}
diff --git a/bwie-common/src/main/java/com/bwie/common/utils/JwtUtils.java b/bwie-common/src/main/java/com/bwie/common/utils/JwtUtils.java
new file mode 100644
index 0000000..ff475e1
--- /dev/null
+++ b/bwie-common/src/main/java/com/bwie/common/utils/JwtUtils.java
@@ -0,0 +1,109 @@
+package com.bwie.common.utils;
+
+import com.bwie.common.constants.JwtConstants;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+
+import java.util.Map;
+
+/**
+ * @description: Jwt工具类
+ * @author
+ */
+public class JwtUtils {
+
+ /**
+ * 秘钥
+ */
+ public static String secret = JwtConstants.SECRET;
+
+ /**
+ * 从数据声明生成令牌
+ *
+ * @param claims 数据声明
+ * @return 令牌
+ */
+ public static String createToken(Map claims){
+ String token = Jwts.builder().setClaims(claims).signWith(SignatureAlgorithm.HS512, secret).compact();
+ return token;
+ }
+
+ /**
+ * 从令牌中获取数据声明
+ *
+ * @param token 令牌
+ * @return 数据声明
+ */
+ public static Claims parseToken(String token){
+ return Jwts.parser().setSigningKey(secret).parseClaimsJws(token).getBody();
+ }
+ /**
+ * 根据令牌获取用户标识
+ *
+ * @param token 令牌
+ * @return 用户ID
+ */
+ public static String getUserKey(String token){
+ Claims claims = parseToken(token);
+ return getValue(claims, JwtConstants.USER_KEY);
+ }
+ /**
+ * 根据令牌获取用户标识
+ *
+ * @param claims 身份信息
+ * @return 用户ID
+ */
+ public static String getUserKey(Claims claims){
+ return getValue(claims, JwtConstants.USER_KEY);
+ }
+ /**
+ * 根据令牌获取用户ID
+ *
+ * @param token 令牌
+ * @return 用户ID
+ */
+ public static String getUserId(String token){
+ Claims claims = parseToken(token);
+ return getValue(claims, JwtConstants.DETAILS_USER_ID);
+ }
+ /**
+ * 根据身份信息获取用户ID
+ *
+ * @param claims 身份信息
+ * @return 用户ID
+ */
+ public static String getUserId(Claims claims){
+ return getValue(claims, JwtConstants.DETAILS_USER_ID);
+ }
+ /**
+ * 根据令牌获取用户名
+ *
+ * @param token 令牌
+ * @return 用户名
+ */
+ public static String getUserName(String token){
+ Claims claims = parseToken(token);
+ return getValue(claims, JwtConstants.DETAILS_USERNAME);
+ }
+ /**
+ * 根据身份信息获取用户名
+ *
+ * @param claims 身份信息
+ * @return 用户名
+ */
+ public static String getUserName(Claims claims){
+ return getValue(claims, JwtConstants.DETAILS_USERNAME);
+ }
+ /**
+ * 根据身份信息获取键值
+ *
+ * @param claims 身份信息
+ * @param key 键
+ * @return 值
+ */
+ public static String getValue(Claims claims, String key){
+ Object obj = claims.get(key);
+ return obj == null ? "" : obj.toString();
+ }
+}
diff --git a/bwie-common/src/main/java/com/bwie/common/utils/OssUtil.java b/bwie-common/src/main/java/com/bwie/common/utils/OssUtil.java
new file mode 100644
index 0000000..9c1383f
--- /dev/null
+++ b/bwie-common/src/main/java/com/bwie/common/utils/OssUtil.java
@@ -0,0 +1,153 @@
+package com.bwie.common.utils;
+
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClientBuilder;
+import com.aliyun.oss.model.GetObjectRequest;
+import com.aliyun.oss.model.PutObjectRequest;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+/**
+ * Oss服务调用
+ */
+@Log4j2
+public class OssUtil {
+
+ /**
+ * Endpoint 存储对象概述 阿里云主账号AccessKey,accessKeySecret拥有所有API的访问权限 访问路径前缀 存储对象概述
+ */
+ private static String endPoint = "oss-cn-shanghai.aliyuncs.com";
+ private static String accessKeyId = "LTAI5tD2tppzLQ4Rb6yKYyph";
+ private static String accessKeySecret = "KEKNKwVvDq7PZLjE63NPBouqHXox4Q";
+ private static String accessPre = "https://dzlmuyu.oss-cn-shanghai.aliyuncs.com/";
+
+ /**
+ * bucket名称
+ * @return
+ */
+ private static String bucketName = "dzlmuyu";
+
+ private static OSS ossClient ;
+
+ static {
+ ossClient = new OSSClientBuilder().build(
+ endPoint,
+ accessKeyId,
+ accessKeySecret);
+ log.info("oss服务连接成功!");
+ }
+
+ /**
+ * 默认路径上传本地文件
+ * @param filePath
+ */
+ public static String uploadFile(String filePath){
+ return uploadFileForBucket(bucketName,getOssFilePath(filePath) ,filePath);
+ }
+
+ /**
+ * 默认路径上传multipartFile文件
+ * @param multipartFile
+ */
+ public static String uploadMultipartFile(MultipartFile multipartFile) {
+ return uploadMultipartFile(bucketName,getOssFilePath(multipartFile.getOriginalFilename()),multipartFile);
+ }
+ /**
+ * 上传 multipartFile 类型文件
+ * @param bucketName
+ * @param ossPath
+ * @param multipartFile
+ */
+ public static String uploadMultipartFile(String bucketName , String ossPath , MultipartFile multipartFile){
+ InputStream inputStream = null;
+ try {
+ inputStream = multipartFile.getInputStream();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ uploadFileInputStreamForBucket(bucketName, ossPath, inputStream);
+ return accessPre+ossPath;
+ }
+
+ /**
+ * 使用File上传PutObject上传文件 ** 程序默认使用次方法上传
+ * @param bucketName 实例名称
+ * @param ossPath oss存储路径
+ * @param filePath 本地文件路径
+ */
+ public static String uploadFileForBucket(String bucketName , String ossPath , String filePath) {
+ // 创建PutObjectRequest对象。
+ PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, ossPath, new File(filePath));
+
+ // 上传
+ ossClient.putObject(putObjectRequest);
+ return accessPre+ossPath;
+ }
+
+ /**
+ * 使用文件流上传到指定的bucket实例
+ * @param bucketName 实例名称
+ * @param ossPath oss存储路径
+ * @param filePath 本地文件路径
+ */
+ public static String uploadFileInputStreamForBucket(String bucketName , String ossPath , String filePath){
+
+ // 填写本地文件的完整路径。如果未指定本地路径,则默认从示例程序所属项目对应本地路径中上传文件流。
+ InputStream inputStream = null;
+ try {
+ inputStream = new FileInputStream(filePath);
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ }
+ // 填写Bucket名称和Object完整路径。Object完整路径中不能包含Bucket名称。
+ uploadFileInputStreamForBucket(bucketName, ossPath, inputStream);
+ return accessPre+ossPath;
+ }
+
+ public static void uploadFileInputStreamForBucket(String bucketName , String ossPath , InputStream inputStream ){
+ ossClient.putObject(bucketName, ossPath, inputStream);
+ }
+
+ /**
+ * 下载
+ * @param ossFilePath
+ * @param filePath
+ */
+ public static void downloadFile(String ossFilePath , String filePath ){
+ downloadFileForBucket(bucketName , ossFilePath , filePath);
+ }
+ /**
+ * 下载
+ * @param bucketName 实例名称
+ * @param ossFilePath oss存储路径
+ * @param filePath 本地文件路径
+ */
+ public static void downloadFileForBucket(String bucketName , String ossFilePath , String filePath ){
+ ossClient.getObject(new GetObjectRequest(bucketName, ossFilePath), new File(filePath));
+ }
+
+ /**
+ *
+ * @return
+ */
+ public static String getOssDefaultPath(){
+ LocalDateTime now = LocalDateTime.now();
+ String url =
+ now.getYear()+"/"+
+ now.getMonth()+"/"+
+ now.getDayOfMonth()+"/"+
+ now.getHour()+"/"+
+ now.getMinute()+"/";
+ return url;
+ }
+
+ public static String getOssFilePath(String filePath){
+ String fileSuf = filePath.substring(filePath.indexOf(".") + 1);
+ return getOssDefaultPath() + UUID.randomUUID().toString() + "." + fileSuf;
+ }
+
+}
diff --git a/bwie-common/src/main/java/com/bwie/common/utils/StringUtils.java b/bwie-common/src/main/java/com/bwie/common/utils/StringUtils.java
new file mode 100644
index 0000000..f483b91
--- /dev/null
+++ b/bwie-common/src/main/java/com/bwie/common/utils/StringUtils.java
@@ -0,0 +1,68 @@
+package com.bwie.common.utils;
+
+import org.springframework.util.AntPathMatcher;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @author
+ * @description: 字符串处理工具类
+ */
+public class StringUtils extends org.apache.commons.lang3.StringUtils {
+
+ /**
+ * * 判断一个对象是否为空
+ *
+ * @param object Object
+ * @return true:为空 false:非空
+ */
+ public static boolean isNull(Object object) {
+ return object == null;
+ }
+
+ /**
+ * * 判断一个Collection是否为空, 包含List,Set,Queue
+ *
+ * @param coll 要判断的Collection
+ * @return true:为空 false:非空
+ */
+ public static boolean isEmpty(Collection> coll) {
+ return isNull(coll) || coll.isEmpty();
+ }
+
+ /**
+ * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串
+ *
+ * @param str 指定字符串
+ * @param strs 需要检查的字符串数组
+ * @return 是否匹配
+ */
+ public static boolean matches(String str, List strs) {
+ if (isEmpty(str) || isEmpty(strs)) {
+ return false;
+ }
+ for (String pattern : strs) {
+ if (isMatch(pattern, str))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 判断url是否与规则配置:
+ * ? 表示单个字符;
+ * * 表示一层路径内的任意字符串,不可跨层级;
+ * ** 表示任意层路径;
+ *
+ * @param pattern 匹配规则
+ * @param url 需要匹配的url
+ * @return
+ */
+ public static boolean isMatch(String pattern, String url) {
+ AntPathMatcher matcher = new AntPathMatcher();
+ return matcher.match(pattern, url);
+ }
+}
diff --git a/bwie-common/src/main/java/com/bwie/common/utils/TelSmsUtils.java b/bwie-common/src/main/java/com/bwie/common/utils/TelSmsUtils.java
new file mode 100644
index 0000000..d09e4d0
--- /dev/null
+++ b/bwie-common/src/main/java/com/bwie/common/utils/TelSmsUtils.java
@@ -0,0 +1,87 @@
+package com.bwie.common.utils;
+
+import com.alibaba.fastjson.JSONObject;
+import com.aliyun.dysmsapi20170525.Client;
+import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
+import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
+import com.aliyun.teaopenapi.models.Config;
+import lombok.extern.log4j.Log4j2;
+
+import java.util.Map;
+
+/**
+ * 短信工具类
+ */
+@Log4j2
+public class TelSmsUtils {
+
+ /**
+ * 阿里云主账号AccessKey,accessKeySecret拥有所有API的访问权限
+ */
+ private static String accessKeyId = "LTAI5tMRrNoxsBPgb6bYZWTW";
+ private static String accessKeySecret = "r9LXZtt3ewEG2DHQ6DbAc65F0AFRA7";
+ private static String templateCode = "SMS10001";
+
+ /**
+ * 短信访问域名
+ */
+ private static String endpoint = "dysmsapi.aliyuncs.com";
+ /**
+ * 短信签名
+ */
+ private static String signName = "登录验证";
+
+ /**
+ * 实例化短信对象
+ */
+ private static Client client;
+
+ static {
+ log.info("初始化短信服务开始");
+ long startTime = System.currentTimeMillis();
+ try {
+ client = initClient();
+ log.info("初始化短信成功:{}",signName);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ log.info("初始化短信服务结束:耗时:{}MS",(System.currentTimeMillis()-startTime));
+ }
+ /**
+ * 初始化短信对象
+ * @return
+ * @throws Exception
+ */
+ private static Client initClient() throws Exception{
+ Config config = new Config()
+ // 您的AccessKey ID
+ .setAccessKeyId(accessKeyId)
+ // 您的AccessKey Secret
+ .setAccessKeySecret(accessKeySecret);
+ // 访问的域名
+ config.endpoint = endpoint;
+ return new Client(config);
+ }
+
+ /**
+ * 发送单条短信
+ * @param tel
+ * @param sendDataMap
+ */
+ public static String sendSms(String tel , Map sendDataMap){
+ SendSmsRequest sendSmsRequest = new SendSmsRequest()
+ .setPhoneNumbers(tel)
+ .setSignName(signName)
+ .setTemplateCode(templateCode)
+ .setTemplateParam(JSONObject.toJSONString(sendDataMap));
+ SendSmsResponse sendSmsResponse = null;
+ try {
+ log.info("发送短信验证码:消息内容是:【{}】", JSONObject.toJSONString(sendDataMap));
+ sendSmsResponse = client.sendSms(sendSmsRequest);
+ } catch (Exception e) {
+ log.error("短信发送异常,手机号:【{}】,短信内容:【{}】,异常信息:【{}】", tel, sendDataMap, e);
+ }
+ return JSONObject.toJSONString(sendSmsResponse.getBody());
+ }
+
+}
diff --git a/bwie-gateway/pom.xml b/bwie-gateway/pom.xml
new file mode 100644
index 0000000..20b467c
--- /dev/null
+++ b/bwie-gateway/pom.xml
@@ -0,0 +1,42 @@
+
+
+ 4.0.0
+
+ com.bwie
+ boot1117
+ 1.0-SNAPSHOT
+
+
+ bwie-gateway
+
+
+ 8
+ 8
+ UTF-8
+
+
+
+
+ com.bwie
+ bwie-common
+
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter-gateway
+
+
+
+ com.alibaba.cloud
+ spring-cloud-alibaba-sentinel-gateway
+
+
+
+ com.alibaba.csp
+ sentinel-spring-cloud-gateway-adapter
+
+
+
diff --git a/bwie-gateway/src/main/java/com/bwie/gateway/GatewayApplication.java b/bwie-gateway/src/main/java/com/bwie/gateway/GatewayApplication.java
new file mode 100644
index 0000000..3619137
--- /dev/null
+++ b/bwie-gateway/src/main/java/com/bwie/gateway/GatewayApplication.java
@@ -0,0 +1,11 @@
+package com.bwie.gateway;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class GatewayApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(GatewayApplication.class);
+ }
+}
diff --git a/bwie-gateway/src/main/java/com/bwie/gateway/config/IgnoreWhiteConfig.java b/bwie-gateway/src/main/java/com/bwie/gateway/config/IgnoreWhiteConfig.java
new file mode 100644
index 0000000..fdb7ffe
--- /dev/null
+++ b/bwie-gateway/src/main/java/com/bwie/gateway/config/IgnoreWhiteConfig.java
@@ -0,0 +1,32 @@
+package com.bwie.gateway.config;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description: 放行白名单配置
+ * @author
+ */
+@Configuration
+@RefreshScope
+@ConfigurationProperties(prefix = "ignore")
+@Data
+@Log4j2
+public class IgnoreWhiteConfig {
+ /**
+ * 放行白名单配置,网关不校验此处的白名单
+ */
+ private List whites = new ArrayList<>();
+
+ public void setWhites(List whites) {
+ log.info("加载网关路径白名单:{}", JSONObject.toJSONString(whites));
+ this.whites = whites;
+ }
+}
diff --git a/bwie-gateway/src/main/java/com/bwie/gateway/filters/AuthFilter.java b/bwie-gateway/src/main/java/com/bwie/gateway/filters/AuthFilter.java
new file mode 100644
index 0000000..57c7ea8
--- /dev/null
+++ b/bwie-gateway/src/main/java/com/bwie/gateway/filters/AuthFilter.java
@@ -0,0 +1,66 @@
+package com.bwie.gateway.filters;
+
+import com.bwie.common.constants.TokenConstants;
+import com.bwie.common.utils.JwtUtils;
+import com.bwie.common.utils.StringUtils;
+import com.bwie.gateway.config.IgnoreWhiteConfig;
+import com.bwie.gateway.utils.GatewayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.gateway.filter.GatewayFilterChain;
+import org.springframework.cloud.gateway.filter.GlobalFilter;
+import org.springframework.core.Ordered;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.stereotype.Component;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+
+@Component
+public class AuthFilter implements GlobalFilter, Ordered {
+ @Autowired
+ private IgnoreWhiteConfig ignoreWhiteConfig;
+ @Autowired
+ private RedisTemplate redisTemplate;
+
+ @Override
+ public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) {
+ // 判断 当前的请求 是否 是 白名单 请求
+ // 获取 系统定义的白名单 请求
+ List whites = ignoreWhiteConfig.getWhites();
+ // 获取 当前请求的 URI
+ ServerHttpRequest request = exchange.getRequest();
+ String path = request.getURI().getPath();
+ if (StringUtils.matches(path, whites)) {
+ // 白名单请求 放行
+ return chain.filter(exchange);
+ }
+ // token 非空
+ String token = request.getHeaders().getFirst(TokenConstants.TOKEN);
+ if (StringUtils.isEmpty(token)) {
+ return GatewayUtils.errorResponse(exchange, "token不能为空!", HttpStatus.UNAUTHORIZED);
+ }
+ // token 合法性 如果token 是假的的 方法就会抛出异常
+ try {
+ JwtUtils.parseToken(token);
+ } catch (Exception e) {
+ return GatewayUtils.errorResponse(exchange, "token不合法!");
+ }
+ // token 有效 【是否过期】
+ // 获取 UserKey
+ String userKey = JwtUtils.getUserKey(token);
+ Boolean hasKey = redisTemplate.hasKey(TokenConstants.LOGIN_TOKEN_KEY + userKey);
+ if (null == hasKey || !hasKey) {
+ return GatewayUtils.errorResponse(exchange, "token过期!");
+ }
+ // 验证通过放行
+ return chain.filter(exchange);
+ }
+
+ @Override
+ public int getOrder() {
+ return 0;
+ }
+}
diff --git a/bwie-gateway/src/main/java/com/bwie/gateway/utils/GatewayUtils.java b/bwie-gateway/src/main/java/com/bwie/gateway/utils/GatewayUtils.java
new file mode 100644
index 0000000..53f1b61
--- /dev/null
+++ b/bwie-gateway/src/main/java/com/bwie/gateway/utils/GatewayUtils.java
@@ -0,0 +1,98 @@
+package com.bwie.gateway.utils;
+
+import com.alibaba.fastjson.JSONObject;
+import com.bwie.common.result.Result;
+import com.bwie.common.utils.StringUtils;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.http.server.reactive.ServerHttpResponse;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
+
+/**
+ * @author
+ * @description: 网关处理工具类
+ */
+@Log4j2
+public class GatewayUtils {
+ /**
+ * 添加请求头参数
+ * @param mutate 修改对象
+ * @param key 键
+ * @param value 值
+ */
+ public static void addHeader(ServerHttpRequest.Builder mutate, String key, Object value) {
+ if (StringUtils.isEmpty(key)){
+ log.warn("添加请求头参数键不可以为空");
+ return;
+ }
+ if (value == null) {
+ log.warn("添加请求头参数:[{}]值为空",key);
+ return;
+ }
+ String valueStr = value.toString();
+ mutate.header(key, valueStr);
+ log.info("添加请求头参数成功 - 键:[{}] , 值:[{}]", key , value);
+ }
+
+ /**
+ * 删除请求头参数
+ * @param mutate 修改对象
+ * @param key 键
+ */
+ public static void removeHeader(ServerHttpRequest.Builder mutate, String key) {
+ if (StringUtils.isEmpty(key)){
+ log.warn("删除请求头参数键不可以为空");
+ return;
+ }
+ mutate.headers(httpHeaders -> httpHeaders.remove(key)).build();
+ log.info("删除请求头参数 - 键:[{}]",key);
+ }
+
+ /**
+ * 错误结果响应
+ * @param exchange 响应上下文
+ * @param msg 响应消息
+ * @return
+ */
+ public static Mono errorResponse(ServerWebExchange exchange, String msg, HttpStatus httpStatus) {
+ ServerHttpResponse response = exchange.getResponse();
+ //设置HTTP响应头状态
+ response.setStatusCode(httpStatus);
+ //设置HTTP响应头文本格式
+ response.getHeaders().add(HttpHeaders.CONTENT_TYPE, "application/json");
+ //定义响应内容
+ Result> result = Result.error(msg);
+ String resultJson = JSONObject.toJSONString(result);
+ log.error("[鉴权异常处理]请求路径:[{}],异常信息:[{}],响应结果:[{}]", exchange.getRequest().getPath(), msg, resultJson);
+ DataBuffer dataBuffer = response.bufferFactory().wrap(resultJson.getBytes());
+ //进行响应
+ return response.writeWith(Mono.just(dataBuffer));
+ }
+
+ /**
+ * 错误结果响应
+ * @param exchange 响应上下文
+ * @param msg 响应消息
+ * @return
+ */
+ public static Mono errorResponse(ServerWebExchange exchange, String msg) {
+ ServerHttpResponse response = exchange.getResponse();
+ //设置HTTP响应头状态
+ response.setStatusCode(HttpStatus.OK);
+ //设置HTTP响应头文本格式
+ response.getHeaders().add(HttpHeaders.CONTENT_TYPE, "application/json");
+ //定义响应内容
+ Result> result = Result.error(msg);
+ String resultJson = JSONObject.toJSONString(result);
+ log.error("[鉴权异常处理]请求路径:[{}],异常信息:[{}],响应结果:[{}]", exchange.getRequest().getPath(), msg, resultJson);
+ DataBuffer dataBuffer = response.bufferFactory().wrap(resultJson.getBytes());
+ //进行响应
+ return response.writeWith(Mono.just(dataBuffer));
+ }
+
+
+}
diff --git a/bwie-gateway/src/main/resources/bootstrap.yml b/bwie-gateway/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..192c2e4
--- /dev/null
+++ b/bwie-gateway/src/main/resources/bootstrap.yml
@@ -0,0 +1,45 @@
+# Tomcat
+server:
+ port: 18080
+# Spring
+spring:
+ application:
+ # 应用名称
+ name: bwie-gateway
+ profiles:
+ # 环境配置
+ active: dev
+ main:
+ # 允许使用循环引用
+ allow-circular-references: true
+ # 允许定义相同的bean对象 去覆盖原有的
+ allow-bean-definition-overriding: true
+ rabbitmq:
+ host: 101.34.249.114
+ port: 5672
+ username: guest
+ password: guest
+ virtualHost: /
+ listener:
+ simple:
+ prefetch: 1
+ acknowledge-mode: manual
+ retry:
+ enabled:true
+ publisher-confirm-type: correlated
+ publisher-returns: true
+ cloud:
+ nacos:
+ discovery:
+ # 服务注册地址
+ server-addr: 101.34.249.114:8848
+ namespace: a1303f6e-570b-4f04-b78e-cab8002a3ce6
+ config:
+ # 配置中心地址
+ server-addr: 101.34.249.114:8848
+ namespace: a1303f6e-570b-4f04-b78e-cab8002a3ce6
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/bwie-modules/bwie-merch/pom.xml b/bwie-modules/bwie-merch/pom.xml
new file mode 100644
index 0000000..2da7436
--- /dev/null
+++ b/bwie-modules/bwie-merch/pom.xml
@@ -0,0 +1,55 @@
+
+
+ 4.0.0
+
+ com.bwie
+ boot1117
+ 1.0-SNAPSHOT
+ ../../pom.xml
+
+
+ bwie-merch
+
+
+ 8
+ 8
+ UTF-8
+
+
+
+
+ com.bwie
+ bwie-common
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ com.alibaba
+ druid-spring-boot-starter
+ 1.2.8
+
+
+
+ mysql
+ mysql-connector-java
+
+
+
+ org.mybatis.spring.boot
+ mybatis-spring-boot-starter
+ 2.2.2
+
+
+
+ com.github.pagehelper
+ pagehelper-spring-boot-starter
+ 1.4.1
+
+
+
diff --git a/bwie-modules/bwie-merch/src/main/java/com/bwie/merch/MerchApplication.java b/bwie-modules/bwie-merch/src/main/java/com/bwie/merch/MerchApplication.java
new file mode 100644
index 0000000..7227673
--- /dev/null
+++ b/bwie-modules/bwie-merch/src/main/java/com/bwie/merch/MerchApplication.java
@@ -0,0 +1,11 @@
+package com.bwie.merch;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class MerchApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(MerchApplication.class);
+ }
+}
diff --git a/bwie-modules/bwie-merch/src/main/java/com/bwie/merch/controller/MerchController.java b/bwie-modules/bwie-merch/src/main/java/com/bwie/merch/controller/MerchController.java
new file mode 100644
index 0000000..57e0b0e
--- /dev/null
+++ b/bwie-modules/bwie-merch/src/main/java/com/bwie/merch/controller/MerchController.java
@@ -0,0 +1,58 @@
+package com.bwie.merch.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.bwie.common.domain.Merch;
+import com.bwie.common.domain.User;
+import com.bwie.common.domain.request.MerchRequest;
+import com.bwie.common.result.PageResult;
+import com.bwie.common.result.Result;
+import com.bwie.merch.service.MerchService;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@RestController
+@Log4j2
+@RequestMapping("/merch")
+public class MerchController {
+
+ @Autowired
+ private MerchService merchService;
+ @Autowired
+ private HttpServletRequest request;
+
+ /**
+ * 登录列表分页
+ * @param merchRequest
+ * @return
+ */
+ @PostMapping("/queryList")
+ public Result> queryList(@RequestBody MerchRequest merchRequest){
+ log.info("功能名称:登录列表分页,请求URI:{},请求方式:{},请求参数:{}",request.getRequestURI(),
+ request.getMethod(),JSONObject.toJSONString(merchRequest));
+ Result> result=merchService.queryList(merchRequest);
+ log.info("功能名称:登录列表分页,请求URI:{},请求方式:{},响应参数:{}",request.getRequestURI(),
+ request.getMethod(), JSONObject.toJSONString(result));
+ return result;
+ }
+
+ /**
+ * 添加商品
+ * @param merch
+ * @return
+ */
+ @PostMapping("/insertMerch")
+ public Result insertMerch(@RequestBody Merch merch){
+ log.info("功能名称:添加商品,请求URI:{},请求方式:{},请求参数:{}",request.getRequestURI(),
+ request.getMethod(),JSONObject.toJSONString(merch));
+ merchService.insertMerch(merch);
+ Result