整合微信支付部分

src/main/java/com/pay/wxpayback/config/mybatisPlus/CodeGenerator.java

@@ -1,91 +0,0 @@
-package com.pay.wxpayback.config.mybatisPlus;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.generator.FastAutoGenerator;
-import com.baomidou.mybatisplus.generator.config.OutputFile;
-import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
-import com.baomidou.mybatisplus.generator.fill.Column;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author 小王八
- * @date 2022-09-05
- * @Description:
- */
-public class CodeGenerator {
-
-    public static void main(String[] args) {
-        FastAutoGenerator.create("jdbc:mysql://localhost:3306/wxpay?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai","root","password")
-                // 全局配置
-                .globalConfig((scanner, builder) -> builder
-                        .author(scanner.apply("请输入作者名称？")).fileOverride()
-                        // 开启 swagger 模式
-//                        .enableSwagger()
-                        // 覆盖已生成文件
-                        .fileOverride()
-                        //禁止打开输出目录
-                        .disableOpenDir()
-                        //配置时间
-                        .commentDate("yyyy-MM-dd")
-                        // 指定输出目录
-                        .outputDir(System.getProperty("user.dir")+"/src/main/java")
-                )
-                // 包配置
-                .packageConfig(builder -> {
-                    // 设置父包名
-                    builder.parent("com.pay.wxpayback")
-                            .entity("pojo")
-                            .controller("controller")
-                            .service("service")
-                            .serviceImpl("service.impl")
-                            .mapper("mapper")
-                            .xml("mapper.xml")
-                            .pathInfo(Collections.singletonMap(OutputFile.mapperXml,System.getProperty("user.dir")+"/src/main/resources/mapper")); // 设置mapperXml生成路径
-                })
-                // 策略配置
-                .strategyConfig((scanner, builder) -> builder.addInclude(getTables(scanner.apply("请输入表名，多个英文逗号分隔？所有输入 all")))
-                        //controller 配置
-                        .controllerBuilder()
-                        .formatFileName("%sController")
-                        .enableRestStyle()
-                        .enableHyphenStyle()
-                        //service 配置
-                        .serviceBuilder()
-                        .formatServiceFileName("%sService")
-                        .formatServiceImplFileName("%sServiceImpl")
-                        //pojo 配置
-                        .entityBuilder()
-                        .enableLombok()
-                        //自动插入 更新时间 创造时间
-                        .addTableFills(new Column("gmt_create", FieldFill.INSERT))
-                        .addTableFills(new Column("gmt_update",FieldFill.INSERT_UPDATE))
-                        .enableTableFieldAnnotation()
-                        //mapper 配置
-                        .mapperBuilder()
-                        .superClass(BaseMapper.class)
-                        .formatMapperFileName("%sMapper")
-                        .enableMapperAnnotation()
-                        .formatXmlFileName("%sMapper")
-                        .build())
-                /*
-                    模板引擎配置，默认 Velocity 可选模板引擎 Beetl 或 Freemarker
-                   .templateEngine(new BeetlTemplateEngine())
-                   */
-
-                   .templateEngine(new FreemarkerTemplateEngine())
-
-                .execute();
-    }
-
-
-        // 处理 all 情况
-        protected static List<String> getTables(String tables) {
-            return "all".equals(tables) ? Collections.emptyList() : Arrays.asList(tables.split(","));
-        }
-
-
-}

src/main/java/com/pay/wxpayback/config/mybatisPlus/MyMetaObjectHandler.java

@@ -1,30 +0,0 @@
-package com.pay.wxpayback.config.mybatisPlus;
-
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import org.apache.ibatis.reflection.MetaObject;
-import org.springframework.stereotype.Component;
-
-import java.time.LocalDateTime;
-
-/**
- * @author 小王八
- * @date 2021/10/5
- * @Description:
- * mybatis自动填充功能
- */
-
-@Component
-public class MyMetaObjectHandler implements MetaObjectHandler {
-
-    @Override
-    public void insertFill(MetaObject metaObject) {
-        this.strictInsertFill(metaObject, "gmtCreate", LocalDateTime.class, LocalDateTime.now());
-        this.strictUpdateFill(metaObject, "gmtUpdate",  LocalDateTime.class, LocalDateTime.now());
-    }
-
-    @Override
-    public void updateFill(MetaObject metaObject) {
-        this.strictUpdateFill(metaObject, "gmtUpdate",  LocalDateTime.class, LocalDateTime.now());
-    }
-}
-

src/main/java/com/pay/wxpayback/config/mybatisPlus/MybatisPlusConfig.java

@@ -1,38 +0,0 @@
-package com.pay.wxpayback.config.mybatisPlus;
-
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-/**
- * @author 小王八
- * @date 2021/9/23
- * @Description:
- */
-@Configuration
-@EnableTransactionManagement
-@MapperScan("com.pay.*.mapper")
-public class MybatisPlusConfig {
-
-    @Bean
-    public MybatisPlusInterceptor mybatisPlusInterceptor() {
-        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-        //分页配置
-        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.H2));
-        return interceptor;
-    }
-    @Bean
-    public MybatisPlusInterceptor paginationInterceptor() {
-        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-        // 防止全表更新与删除
-        // 针对 update 和 delete 语句
-        interceptor.addInnerInterceptor(new BlockAttackInnerInterceptor());
-        return interceptor;
-    }
-
-}

src/main/java/com/pay/wxpayback/controller/ToolWxConfigController.java

@@ -1,41 +0,0 @@
-package com.pay.wxpayback.controller;
-
-
-import com.pay.wxpayback.constant.SystemConstant;
-import com.pay.wxpayback.constant.wxpay.WXOrderConstant;
-import com.pay.wxpayback.pojo.ToolWxConfig;
-import com.pay.wxpayback.service.ToolWxConfigService;
-import com.pay.wxpayback.utils.WxPayUtil;
-import com.wechat.pay.contrib.apache.httpclient.exception.ParseException;
-import com.wechat.pay.contrib.apache.httpclient.exception.ValidationException;
-import com.wechat.pay.contrib.apache.httpclient.notification.Notification;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * <p>
- * 微信支付参数表 前端控制器
- * </p>
- *
- * @author 小乌龟
- * @since 2022-11-09
- */
-@RestController
-@RequestMapping("/tool-wx-config")
-@Slf4j
-public class ToolWxConfigController {
-
-    @Autowired
-    private ToolWxConfigService toolWxConfigService;
-
-
-}

src/main/java/com/pay/wxpayback/service/impl/UserServiceImpl.java

@@ -1,102 +0,0 @@
-package com.pay.wxpayback.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.text.StrFormatter;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.pay.wxpayback.Enum.WxApiType;
-import com.pay.wxpayback.Enum.WxPayStatusEnum;
-import com.pay.wxpayback.constant.SystemConstant;
-import com.pay.wxpayback.constant.wxpay.WXOrderConstant;
-import com.pay.wxpayback.constant.wxpay.WechatPayHttpHeaders;
-import com.pay.wxpayback.exception.ApiException;
-import com.pay.wxpayback.mapper.OrderMapper;
-import com.pay.wxpayback.pojo.Order;
-import com.pay.wxpayback.pojo.ToolWxConfig;
-import com.pay.wxpayback.pojo.dto.LoginParam;
-import com.pay.wxpayback.pojo.dto.UserParam;
-import com.pay.wxpayback.pojo.vo.ReCreateOrderVO;
-import com.pay.wxpayback.pojo.vo.ToCreateOrderVO;
-import com.pay.wxpayback.pojo.vo.UserInfo;
-import com.pay.wxpayback.pojo.vo.WxLoginVO;
-import com.pay.wxpayback.service.OrderService;
-import com.pay.wxpayback.service.UserService;
-import com.pay.wxpayback.utils.WxPayUtil;
-import com.wechat.pay.contrib.apache.httpclient.util.PemUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.catalina.User;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.util.EntityUtils;
-import org.springframework.stereotype.Service;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
-import java.security.PrivateKey;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * <p>
- * 订单表 服务实现类
- * </p>
- *
- * @author 小王八
- * @since 2023-07-28
- */
-@Service
-@Slf4j
-public class UserServiceImpl extends ServiceImpl<OrderMapper, Order> implements UserService {
-    public  WxLoginVO getOpenId(ToolWxConfig wxConfig, WxLoginVO loginVO){
-        //获取当前的openid
-        Map hashMap = new HashMap();
-        hashMap.put("appid", wxConfig.getAppId());
-        hashMap.put("secret", wxConfig.getAppSecret());
-        hashMap.put("js_code", loginVO.getCode());
-        hashMap.put("grant_type", "authorization_code");
-        String json = HttpUtil.get(WxApiType.WX_LOGIN_URL.getValue(), hashMap);
-        JSONObject jsonObject = JSONUtil.parseObj(json);
-        String openid = jsonObject.getStr("openid");
-        String sessionKey = jsonObject.getStr("session_key");
-        WxLoginVO result = new WxLoginVO();
-        result.setOpenId(openid);
-        result.setSession_key(sessionKey);
-        return result;
-    }
-
-    public UserInfo getMyInfo(UserParam userParam){
-        UserInfo userInfo = new UserInfo();
-        userInfo.setId("1");
-        userInfo.setNickName("小王八");
-        return userInfo;
-    }
-
-    /**
-     * 获取头像登录
-     * @param loginParam
-     * @return
-     */
-    @Override
-    public UserInfo wxMpLogin(LoginParam loginParam) {
-        String jsonStr = WxPayUtil.decryptS5(loginParam.getEncryptedData(), loginParam.getSession_key(), loginParam.getIv());
-        return JSONUtil.toBean(jsonStr, UserInfo.class, true);
-    }
-
-}

src/main/java/com/qmrb/system/SystemApplication.java

@@ -7,7 +7,7 @@ import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilde
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ImportResource;
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {"com.pay","com.qmrb"})
 //@ImportResource(locations = { "application-beans.xml" }) // 导入spring配置文件
 public class SystemApplication {
     public static void main(String[] args) {

src/main/java/com/pay/wxpayback/controller/OrderController.java → src/main/java/com/qmrb/system/controller/OrderController.java

@@ -1,25 +1,24 @@
-package com.pay.wxpayback.controller;
+package com.qmrb.system.controller;
 
 
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.json.JSONUtil;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.pay.wxpayback.api.CommonController;
-import com.pay.wxpayback.api.CommonResult;
-import com.pay.wxpayback.constant.SystemConstant;
-import com.pay.wxpayback.constant.wxpay.WXOrderConstant;
-import com.pay.wxpayback.pojo.Order;
-import com.pay.wxpayback.pojo.ToolWxConfig;
-import com.pay.wxpayback.pojo.dto.LoginParam;
-import com.pay.wxpayback.pojo.dto.UserParam;
-import com.pay.wxpayback.pojo.vo.ReCreateOrderVO;
-import com.pay.wxpayback.pojo.vo.ToCreateOrderVO;
-import com.pay.wxpayback.pojo.vo.UserInfo;
-import com.pay.wxpayback.pojo.vo.WxLoginVO;
-import com.pay.wxpayback.service.OrderService;
-import com.pay.wxpayback.service.ToolWxConfigService;
-import com.pay.wxpayback.service.UserService;
-import com.pay.wxpayback.utils.WxPayUtil;
+import com.qmrb.system.pojo.dto.LoginParam;
+import com.qmrb.system.pojo.dto.UserParam;
+import com.qmrb.system.pojo.entity.Order;
+import com.qmrb.system.pojo.entity.ToolWxConfig;
+import com.qmrb.system.pojo.vo.ReCreateOrderVO;
+import com.qmrb.system.pojo.vo.ToCreateOrderVO;
+import com.qmrb.system.pojo.vo.UserInfo;
+import com.qmrb.system.pojo.vo.WxLoginVO;
+import com.qmrb.system.service.OrderService;
+import com.qmrb.system.service.ToolWxConfigService;
+import com.qmrb.system.service.UserService;
+import com.qmrb.system.utils.WxPayUtil;
+import com.qmrb.system.wxpayback.api.CommonController;
+import com.qmrb.system.wxpayback.api.CommonResult;
+import com.qmrb.system.wxpayback.constant.SystemConstant;
+import com.qmrb.system.wxpayback.constant.wxpay.WXOrderConstant;
 import com.wechat.pay.contrib.apache.httpclient.exception.ParseException;
 import com.wechat.pay.contrib.apache.httpclient.exception.ValidationException;
 import com.wechat.pay.contrib.apache.httpclient.notification.Notification;
@@ -27,9 +26,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.crypto.Cipher;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.HashMap;
@@ -44,7 +40,7 @@ import java.util.Map;
  * @since 2023-07-28
  */
 @RestController
-@RequestMapping("/order")
+@RequestMapping("/api/order")
 @Slf4j
 public class OrderController extends CommonController {
 

src/main/java/com/qmrb/system/controller/ToolWxConfigController.java

@@ -0,0 +1,27 @@
+package com.qmrb.system.controller;
+
+
+import com.qmrb.system.service.ToolWxConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 微信支付参数表 前端控制器
+ * </p>
+ *
+ * @author 小乌龟
+ * @since 2022-11-09
+ */
+@RestController
+@RequestMapping("/tool-wx-config")
+@Slf4j
+public class ToolWxConfigController {
+
+    @Autowired
+    private ToolWxConfigService toolWxConfigService;
+
+
+}

src/main/java/com/pay/wxpayback/controller/UserController.java → src/main/java/com/qmrb/system/controller/UserController.java

@@ -1,36 +1,18 @@
-package com.pay.wxpayback.controller;
+package com.qmrb.system.controller;
 
 
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.json.JSONUtil;
-import com.pay.wxpayback.api.CommonController;
-import com.pay.wxpayback.api.CommonResult;
-import com.pay.wxpayback.constant.SystemConstant;
-import com.pay.wxpayback.constant.wxpay.WXOrderConstant;
-import com.pay.wxpayback.pojo.Order;
-import com.pay.wxpayback.pojo.ToolWxConfig;
-import com.pay.wxpayback.pojo.dto.LoginParam;
-import com.pay.wxpayback.pojo.dto.UserParam;
-import com.pay.wxpayback.pojo.vo.ReCreateOrderVO;
-import com.pay.wxpayback.pojo.vo.ToCreateOrderVO;
-import com.pay.wxpayback.pojo.vo.UserInfo;
-import com.pay.wxpayback.pojo.vo.WxLoginVO;
-import com.pay.wxpayback.service.OrderService;
-import com.pay.wxpayback.service.ToolWxConfigService;
-import com.pay.wxpayback.service.UserService;
-import com.pay.wxpayback.utils.WxPayUtil;
-import com.wechat.pay.contrib.apache.httpclient.exception.ParseException;
-import com.wechat.pay.contrib.apache.httpclient.exception.ValidationException;
-import com.wechat.pay.contrib.apache.httpclient.notification.Notification;
+import com.qmrb.system.pojo.dto.LoginParam;
+import com.qmrb.system.pojo.dto.UserParam;
+import com.qmrb.system.pojo.vo.UserInfo;
+import com.qmrb.system.pojo.vo.WxLoginVO;
+import com.qmrb.system.service.ToolWxConfigService;
+import com.qmrb.system.service.UserService;
+import com.qmrb.system.wxpayback.api.CommonController;
+import com.qmrb.system.wxpayback.api.CommonResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * <p>
  * 用户中心 前端控制器
@@ -40,7 +22,7 @@ import java.util.Map;
  * @since 2023-07-28
  */
 @RestController
-@RequestMapping("/ucenter")
+@RequestMapping("/api/ucenter")
 @Slf4j
 public class UserController extends CommonController {
 

src/main/java/com/pay/wxpayback/mapper/OrderMapper.java → src/main/java/com/qmrb/system/mapper/OrderMapper.java

@@ -1,7 +1,7 @@
-package com.pay.wxpayback.mapper;
+package com.qmrb.system.mapper;
 
-import com.pay.wxpayback.pojo.Order;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmrb.system.pojo.entity.Order;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/pay/wxpayback/mapper/ToolWxConfigMapper.java → src/main/java/com/qmrb/system/mapper/ToolWxConfigMapper.java

@@ -1,7 +1,7 @@
-package com.pay.wxpayback.mapper;
+package com.qmrb.system.mapper;
 
-import com.pay.wxpayback.pojo.ToolWxConfig;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmrb.system.pojo.entity.ToolWxConfig;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/pay/wxpayback/pojo/dto/LoginParam.java → src/main/java/com/qmrb/system/pojo/dto/LoginParam.java

@@ -1,4 +1,4 @@
-package com.pay.wxpayback.pojo.dto;
+package com.qmrb.system.pojo.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/pay/wxpayback/pojo/dto/UserParam.java → src/main/java/com/qmrb/system/pojo/dto/UserParam.java

@@ -1,4 +1,4 @@
-package com.pay.wxpayback.pojo.dto;
+package com.qmrb.system.pojo.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/pay/wxpayback/pojo/Order.java → src/main/java/com/qmrb/system/pojo/entity/Order.java

@@ -1,17 +1,14 @@
-package com.pay.wxpayback.pojo;
+package com.qmrb.system.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 import lombok.experimental.Accessors;
-import org.springframework.beans.factory.annotation.Autowired;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>

src/main/java/com/pay/wxpayback/pojo/ToolWxConfig.java → src/main/java/com/qmrb/system/pojo/entity/ToolWxConfig.java

@@ -1,13 +1,11 @@
-package com.pay.wxpayback.pojo;
+package com.qmrb.system.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
+
+import java.io.Serializable;
 
 /**
  * <p>

src/main/java/com/pay/wxpayback/pojo/WxUser.java → src/main/java/com/qmrb/system/pojo/entity/WxUser.java

@@ -1,4 +1,4 @@
-package com.pay.wxpayback.pojo;
+package com.qmrb.system.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

src/main/java/com/pay/wxpayback/pojo/vo/ReCreateOrderVO.java → src/main/java/com/qmrb/system/pojo/vo/ReCreateOrderVO.java

@@ -1,4 +1,4 @@
-package com.pay.wxpayback.pojo.vo;
+package com.qmrb.system.pojo.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/pay/wxpayback/pojo/vo/ToCreateOrderVO.java → src/main/java/com/qmrb/system/pojo/vo/ToCreateOrderVO.java

@@ -1,4 +1,4 @@
-package com.pay.wxpayback.pojo.vo;
+package com.qmrb.system.pojo.vo;
 
 
 import lombok.AllArgsConstructor;

src/main/java/com/pay/wxpayback/pojo/vo/UserInfo.java → src/main/java/com/qmrb/system/pojo/vo/UserInfo.java

@@ -1,4 +1,4 @@
-package com.pay.wxpayback.pojo.vo;
+package com.qmrb.system.pojo.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/pay/wxpayback/pojo/vo/WxLoginVO.java → src/main/java/com/qmrb/system/pojo/vo/WxLoginVO.java

@@ -1,4 +1,4 @@
-package com.pay.wxpayback.pojo.vo;
+package com.qmrb.system.pojo.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/pay/wxpayback/service/OrderService.java → src/main/java/com/qmrb/system/service/OrderService.java

@@ -1,11 +1,11 @@
-package com.pay.wxpayback.service;
+package com.qmrb.system.service;
 
-import com.pay.wxpayback.pojo.Order;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.pay.wxpayback.pojo.ToolWxConfig;
-import com.pay.wxpayback.pojo.vo.ReCreateOrderVO;
-import com.pay.wxpayback.pojo.vo.ToCreateOrderVO;
-import com.pay.wxpayback.pojo.vo.WxLoginVO;
+import com.qmrb.system.pojo.entity.Order;
+import com.qmrb.system.pojo.entity.ToolWxConfig;
+import com.qmrb.system.pojo.vo.ReCreateOrderVO;
+import com.qmrb.system.pojo.vo.ToCreateOrderVO;
+import com.qmrb.system.pojo.vo.WxLoginVO;
 
 /**
  * <p>

src/main/java/com/pay/wxpayback/service/ToolWxConfigService.java → src/main/java/com/qmrb/system/service/ToolWxConfigService.java

@@ -1,7 +1,7 @@
-package com.pay.wxpayback.service;
+package com.qmrb.system.service;
 
-import com.pay.wxpayback.pojo.ToolWxConfig;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmrb.system.pojo.entity.ToolWxConfig;
 
 /**
  * <p>

src/main/java/com/pay/wxpayback/service/UserService.java → src/main/java/com/qmrb/system/service/UserService.java

@@ -1,14 +1,13 @@
-package com.pay.wxpayback.service;
+package com.qmrb.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.pay.wxpayback.pojo.Order;
-import com.pay.wxpayback.pojo.ToolWxConfig;
-import com.pay.wxpayback.pojo.dto.LoginParam;
-import com.pay.wxpayback.pojo.dto.UserParam;
-import com.pay.wxpayback.pojo.vo.ReCreateOrderVO;
-import com.pay.wxpayback.pojo.vo.ToCreateOrderVO;
-import com.pay.wxpayback.pojo.vo.UserInfo;
-import com.pay.wxpayback.pojo.vo.WxLoginVO;
+import com.qmrb.system.pojo.dto.LoginParam;
+import com.qmrb.system.pojo.dto.UserParam;
+import com.qmrb.system.pojo.entity.Order;
+import com.qmrb.system.pojo.entity.ToolWxConfig;
+import com.qmrb.system.pojo.vo.UserInfo;
+import com.qmrb.system.pojo.vo.WxLoginVO;
+
 
 /**
  * <p>

src/main/java/com/pay/wxpayback/service/impl/OrderServiceImpl.java → src/main/java/com/qmrb/system/service/impl/OrderServiceImpl.java

@@ -1,4 +1,4 @@
-package com.pay.wxpayback.service.impl;
+package com.qmrb.system.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.StrFormatter;
@@ -6,29 +6,28 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSON;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.pay.wxpayback.Enum.WxApiType;
-import com.pay.wxpayback.Enum.WxPayStatusEnum;
-import com.pay.wxpayback.constant.SystemConstant;
-import com.pay.wxpayback.constant.wxpay.WXOrderConstant;
-import com.pay.wxpayback.constant.wxpay.WechatPayHttpHeaders;
-import com.pay.wxpayback.exception.ApiException;
-import com.pay.wxpayback.pojo.Order;
-import com.pay.wxpayback.mapper.OrderMapper;
-import com.pay.wxpayback.pojo.ToolWxConfig;
-import com.pay.wxpayback.pojo.vo.ReCreateOrderVO;
-import com.pay.wxpayback.pojo.vo.ToCreateOrderVO;
-import com.pay.wxpayback.pojo.vo.WxLoginVO;
-import com.pay.wxpayback.service.OrderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.pay.wxpayback.utils.WxPayUtil;
+import com.qmrb.system.mapper.OrderMapper;
+import com.qmrb.system.pojo.entity.Order;
+import com.qmrb.system.pojo.entity.ToolWxConfig;
+import com.qmrb.system.pojo.vo.ReCreateOrderVO;
+import com.qmrb.system.pojo.vo.ToCreateOrderVO;
+import com.qmrb.system.pojo.vo.WxLoginVO;
+import com.qmrb.system.service.OrderService;
+import com.qmrb.system.utils.WxPayUtil;
+import com.qmrb.system.wxpayback.Enum.WxApiType;
+import com.qmrb.system.wxpayback.Enum.WxPayStatusEnum;
+import com.qmrb.system.wxpayback.constant.SystemConstant;
+import com.qmrb.system.wxpayback.constant.wxpay.WXOrderConstant;
+import com.qmrb.system.wxpayback.constant.wxpay.WechatPayHttpHeaders;
+import com.qmrb.system.wxpayback.exception.ApiException;
 import com.wechat.pay.contrib.apache.httpclient.util.PemUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -38,7 +37,6 @@ import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.util.EntityUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -86,7 +84,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         //3.返回结果信息
         return EntityUtils.toString(response.getEntity());
     }
-    public  WxLoginVO getOpenId(ToolWxConfig wxConfig, WxLoginVO loginVO){
+    public WxLoginVO getOpenId(ToolWxConfig wxConfig, WxLoginVO loginVO){
         //获取当前的openid
         Map hashMap = new HashMap();
         hashMap.put("appid", wxConfig.getAppId());
@@ -248,7 +246,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     }
 
     @Override
-    public String refundOrder(ToolWxConfig wxConfig,Order order) {
+    public String refundOrder(ToolWxConfig wxConfig, Order order) {
         try {
             //1.请求配置参数
                 HttpPost httpPost = new HttpPost(WxApiType.REFUND_ORDER.getValue());

src/main/java/com/pay/wxpayback/service/impl/ToolWxConfigServiceImpl.java → src/main/java/com/qmrb/system/service/impl/ToolWxConfigServiceImpl.java

@@ -1,10 +1,9 @@
-package com.pay.wxpayback.service.impl;
+package com.qmrb.system.service.impl;
 
-import com.pay.wxpayback.pojo.ToolWxConfig;
-import com.pay.wxpayback.mapper.ToolWxConfigMapper;
-import com.pay.wxpayback.service.ToolWxConfigService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.qmrb.system.mapper.ToolWxConfigMapper;
+import com.qmrb.system.pojo.entity.ToolWxConfig;
+import com.qmrb.system.service.ToolWxConfigService;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;

src/main/java/com/qmrb/system/service/impl/UserServiceImpl.java

@@ -0,0 +1,70 @@
+package com.qmrb.system.service.impl;
+
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.qmrb.system.mapper.OrderMapper;
+import com.qmrb.system.pojo.dto.LoginParam;
+import com.qmrb.system.pojo.dto.UserParam;
+import com.qmrb.system.pojo.entity.Order;
+import com.qmrb.system.pojo.entity.ToolWxConfig;
+import com.qmrb.system.pojo.vo.UserInfo;
+import com.qmrb.system.pojo.vo.WxLoginVO;
+import com.qmrb.system.service.UserService;
+import com.qmrb.system.utils.WxPayUtil;
+import com.qmrb.system.wxpayback.Enum.WxApiType;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单表 服务实现类
+ * </p>
+ *
+ * @author 小王八
+ * @since 2023-07-28
+ */
+@Service
+@Slf4j
+public class UserServiceImpl extends ServiceImpl<OrderMapper, Order> implements UserService {
+    public WxLoginVO getOpenId(ToolWxConfig wxConfig, WxLoginVO loginVO){
+        //获取当前的openid
+        Map hashMap = new HashMap();
+        hashMap.put("appid", wxConfig.getAppId());
+        hashMap.put("secret", wxConfig.getAppSecret());
+        hashMap.put("js_code", loginVO.getCode());
+        hashMap.put("grant_type", "authorization_code");
+        String json = HttpUtil.get(WxApiType.WX_LOGIN_URL.getValue(), hashMap);
+        JSONObject jsonObject = JSONUtil.parseObj(json);
+        String openid = jsonObject.getStr("openid");
+        String sessionKey = jsonObject.getStr("session_key");
+        WxLoginVO result = new WxLoginVO();
+        result.setOpenId(openid);
+        result.setSession_key(sessionKey);
+        return result;
+    }
+
+    public UserInfo getMyInfo(UserParam userParam){
+        UserInfo userInfo = new UserInfo();
+        userInfo.setId("1");
+        userInfo.setNickName("小王八");
+        return userInfo;
+    }
+
+    /**
+     * 获取头像登录
+     * @param loginParam
+     * @return
+     */
+    @Override
+    public UserInfo wxMpLogin(LoginParam loginParam) {
+        String jsonStr = WxPayUtil.decryptS5(loginParam.getEncryptedData(), loginParam.getSession_key(), loginParam.getIv());
+        return JSONUtil.toBean(jsonStr, UserInfo.class, true);
+    }
+
+}

src/main/java/com/pay/wxpayback/utils/IdWorker.java → src/main/java/com/qmrb/system/utils/IdWorker.java

@@ -1,4 +1,4 @@
-package com.pay.wxpayback.utils;
+package com.qmrb.system.utils;
 
 
 import org.springframework.stereotype.Component;

src/main/java/com/pay/wxpayback/utils/WxPayUtil.java → src/main/java/com/qmrb/system/utils/WxPayUtil.java

@@ -1,14 +1,15 @@
-package com.pay.wxpayback.utils;
+package com.qmrb.system.utils;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.pay.wxpayback.constant.SystemConstant;
-import com.pay.wxpayback.constant.wxpay.WXOrderConstant;
-import com.pay.wxpayback.constant.wxpay.WechatPayHttpHeaders;
-import com.pay.wxpayback.exception.ApiException;
-import com.pay.wxpayback.pojo.ToolWxConfig;
-import com.pay.wxpayback.pojo.vo.UserInfo;
+
+import com.qmrb.system.pojo.entity.ToolWxConfig;
+import com.qmrb.system.pojo.vo.UserInfo;
+import com.qmrb.system.wxpayback.constant.SystemConstant;
+import com.qmrb.system.wxpayback.constant.wxpay.WXOrderConstant;
+import com.qmrb.system.wxpayback.constant.wxpay.WechatPayHttpHeaders;
+import com.qmrb.system.wxpayback.exception.ApiException;
 import com.wechat.pay.contrib.apache.httpclient.WechatPayHttpClientBuilder;
 import com.wechat.pay.contrib.apache.httpclient.auth.PrivateKeySigner;
 import com.wechat.pay.contrib.apache.httpclient.auth.Verifier;
@@ -21,12 +22,9 @@ import com.wechat.pay.contrib.apache.httpclient.notification.Notification;
 import com.wechat.pay.contrib.apache.httpclient.notification.NotificationHandler;
 import com.wechat.pay.contrib.apache.httpclient.notification.NotificationRequest;
 import com.wechat.pay.contrib.apache.httpclient.util.PemUtil;
-
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import java.util.Base64;
-
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
@@ -37,6 +35,7 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.security.*;
+import java.util.Base64;
 
 /**
  * @Description

src/main/java/com/pay/wxpayback/Enum/WxApiType.java → src/main/java/com/qmrb/system/wxpayback/Enum/WxApiType.java

@@ -1,4 +1,4 @@
-package com.pay.wxpayback.Enum;
+package com.qmrb.system.wxpayback.Enum;
 
 /**
   *微信支付 api调用接口

src/main/java/com/pay/wxpayback/Enum/WxPayStatusEnum.java → src/main/java/com/qmrb/system/wxpayback/Enum/WxPayStatusEnum.java

@@ -1,4 +1,4 @@
-package com.pay.wxpayback.Enum;
+package com.qmrb.system.wxpayback.Enum;
 
 /**
  * @Description 微信支付状态

src/main/java/com/pay/wxpayback/api/CommonController.java → src/main/java/com/qmrb/system/wxpayback/api/CommonController.java

@@ -1,8 +1,7 @@
-package com.pay.wxpayback.api;
+package com.qmrb.system.wxpayback.api;
 
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.pay.wxpayback.constant.SystemConstant;
-import com.pay.wxpayback.exception.ApiException;
+import com.qmrb.system.wxpayback.exception.ApiException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.ObjectError;
@@ -64,7 +63,7 @@ public class CommonController {
     }
 
 
-    private <M> CommonResult<M>  successResult() {
+    private <M> CommonResult<M> successResult() {
         CommonResult<M> CommonResult = new CommonResult<>();
         CommonResult.setCode(ResultCode.SUCCESS.getCode());
         CommonResult.setMessage(ResultCode.SUCCESS.getMessage());

src/main/java/com/pay/wxpayback/api/CommonResult.java → src/main/java/com/qmrb/system/wxpayback/api/CommonResult.java

@@ -1,4 +1,4 @@
-package com.pay.wxpayback.api;
+package com.qmrb.system.wxpayback.api;
 
 /**
  * @Description 通用返回对象
@@ -60,7 +60,7 @@ public class CommonResult<T> {
      * @param errorCode 错误码
      * @param message 错误信息
      */
-    public static <T> CommonResult<T> failed(IErrorCode errorCode,String message) {
+    public static <T> CommonResult<T> failed(IErrorCode errorCode, String message) {
         return new CommonResult<T>(errorCode.getCode(), message, null);
     }
 

src/main/java/com/pay/wxpayback/api/IErrorCode.java → src/main/java/com/qmrb/system/wxpayback/api/IErrorCode.java

@@ -1,4 +1,4 @@
-package com.pay.wxpayback.api;
+package com.qmrb.system.wxpayback.api;
 
 /**
  * @Description 常用API返回对象接口

src/main/java/com/pay/wxpayback/api/ResultCode.java → src/main/java/com/qmrb/system/wxpayback/api/ResultCode.java

@@ -1,11 +1,11 @@
-package com.pay.wxpayback.api;
+package com.qmrb.system.wxpayback.api;
 
 /**
  * @Description 常用API返回对象
  * @Author 小乌龟
  * @Date 2022/11/12 14:57
  */
-public enum ResultCode implements IErrorCode{
+public enum ResultCode implements IErrorCode {
     SUCCESS(200, "操作成功"),
     FAILED(500, "操作失败"),
     VALIDATE_FAILED(404, "参数检验失败"),

src/main/java/com/pay/wxpayback/api/Supplier.java → src/main/java/com/qmrb/system/wxpayback/api/Supplier.java

@@ -1,4 +1,4 @@
-package com.pay.wxpayback.api;
+package com.qmrb.system.wxpayback.api;
 
 /**
  * controller层 函数编程

src/main/java/com/pay/wxpayback/constant/SystemConstant.java → src/main/java/com/qmrb/system/wxpayback/constant/SystemConstant.java

@@ -1,4 +1,4 @@
-package com.pay.wxpayback.constant;
+package com.qmrb.system.wxpayback.constant;
 
 /**
  * @Description 系统常量

src/main/java/com/pay/wxpayback/constant/wxpay/WXOrderConstant.java → src/main/java/com/qmrb/system/wxpayback/constant/wxpay/WXOrderConstant.java

@@ -1,4 +1,4 @@
-package com.pay.wxpayback.constant.wxpay;
+package com.qmrb.system.wxpayback.constant.wxpay;
 
 /**
  * @Description 微信支付参数

src/main/java/com/pay/wxpayback/constant/wxpay/WechatPayHttpHeaders.java → src/main/java/com/qmrb/system/wxpayback/constant/wxpay/WechatPayHttpHeaders.java

@@ -1,4 +1,4 @@
-package com.pay.wxpayback.constant.wxpay;
+package com.qmrb.system.wxpayback.constant.wxpay;
 
 /**
  *微信支付HTTP请求头相关常量

src/main/java/com/pay/wxpayback/exception/ApiException.java → src/main/java/com/qmrb/system/wxpayback/exception/ApiException.java

@@ -1,6 +1,7 @@
-package com.pay.wxpayback.exception;
+package com.qmrb.system.wxpayback.exception;
 
-import com.pay.wxpayback.api.IErrorCode;
+
+import com.qmrb.system.wxpayback.api.IErrorCode;
 
 /**
  * @Description 自定义API异常

src/main/java/com/pay/wxpayback/exception/Asserts.java → src/main/java/com/qmrb/system/wxpayback/exception/Asserts.java

@@ -1,6 +1,7 @@
-package com.pay.wxpayback.exception;
+package com.qmrb.system.wxpayback.exception;
 
-import com.pay.wxpayback.api.IErrorCode;
+
+import com.qmrb.system.wxpayback.api.IErrorCode;
 
 /**
  * @Description 断言处理类，用于抛出各种API异常

src/main/java/com/pay/wxpayback/exception/GlobalExceptionHandler.java → src/main/java/com/qmrb/system/wxpayback/exception/GlobalExceptionHandler.java

@@ -1,3 +1,4 @@
+package com.qmrb.system.wxpayback.exception;/*
 package com.pay.wxpayback.exception;
 
 import com.pay.wxpayback.api.CommonResult;
@@ -15,17 +16,21 @@ import javax.validation.ConstraintViolationException;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+*/
 /**
  * @Description 全局异常捕获
  * @Author 小乌龟
  * @Date 2022/11/12 14:49
- */
+ *//*
+
 @ControllerAdvice
 public class GlobalExceptionHandler {
 
-    /**
+    */
+/**
      * 自定义异常
-     */
+     *//*
+
     @ResponseBody
     @ExceptionHandler(value = ApiException.class)
     public CommonResult handle(ApiException e) {
@@ -35,9 +40,11 @@ public class GlobalExceptionHandler {
         return CommonResult.failed(e.getMessage());
     }
 
-    /**
+    */
+/**
      *BindException MethodArgumentNotValidException  validation异常 ConstraintViolationException (全部都是参数异常)
-     */
+     *//*
+
     @ResponseBody
     @ExceptionHandler(value = MethodArgumentNotValidException.class)
     public CommonResult handleValidException(MethodArgumentNotValidException e) {
@@ -70,3 +77,4 @@ public class GlobalExceptionHandler {
         return CommonResult.validateFailed(message);
     }
 }
+*/