删除无效类

joying-admin/src/main/java/com/fzm/admin/controller/NftController.java

@@ -31,9 +31,6 @@ import java.util.List;
 public class NftController {
 
     @Resource
-    private RabbitTemplate rabbitTemplate;
-
-    @Resource
     private NftService nftService;
 
     @Resource

joying-admin/src/main/java/com/fzm/admin/controller/RefundController.java

@@ -2,10 +2,8 @@ package com.fzm.admin.controller;
 
 import com.fzm.common.annotation.Authentication;
 import com.fzm.common.entity.vo.PaymentVo;
-import com.fzm.common.enums.RefundLaunchChannel;
 import com.fzm.common.model.ResponseModel;
 import com.fzm.common.service.RefundService;
-import com.fzm.common.service.WxPayService;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

joying-admin/src/main/resources/application-prod.yml

@@ -104,6 +104,8 @@ wx-pay:
   api-v3-key: D864DA53FEF8ACD41519064967DC10D2
   mch-serial-num: 72A62544B0A08A214FAEC780108692EDC6E7D5FA
   private-key-path: apiclient_key.pem
+  pay-notify-url: https://nft.inmvo.com/proxyApi/wx-pay/notify/jsapi
+  refund-notify-url: https://nft.inmvo.com/proxyApi/wx-pay/notify/refund
 
 sms:
   app-key: Yiru

joying-common/src/main/java/com/fzm/common/config/ObsConfig.java

@@ -2,6 +2,7 @@ package com.fzm.common.config;
 
 import com.fzm.common.properties.ObsProperties;
 import com.obs.services.ObsClient;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -11,6 +12,7 @@ import org.springframework.context.annotation.Configuration;
  * @date 2021/12/31 14:51
  */
 @Configuration
+@EnableConfigurationProperties(value = ObsProperties.class)
 public class ObsConfig {
 
     @Bean

joying-common/src/main/java/com/fzm/common/properties/ObsProperties.java

@@ -9,7 +9,6 @@ import org.springframework.stereotype.Component;
  * @date 2021/6/29 15:54
  */
 @Data
-@Component
 @ConfigurationProperties(prefix = "huaweiyun.obs")
 public class ObsProperties {
 

joying-common/src/main/java/com/fzm/common/properties/OssProperties.java

-package com.fzm.common.properties;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * @author tangtuo
- * @date 2021/6/29 15:54
- */
-@Data
-@Component
-@ConfigurationProperties(prefix = "aliyun.oss")
-public class OssProperties {
-
-    private String appKey;
-
-    private String appSecret;
-
-    private String endPoint;
-
-    /**
-     * 非加密文件存储的bucket
-     */
-    private String simpleBucket;
-
-    /**
-     * 加密文件存储的bucket
-     */
-    private String encryptBucket;
-}

joying-common/src/main/java/com/fzm/common/service/impl/UserServiceImpl.java

@@ -22,7 +22,6 @@ import com.fzm.common.enums.ResultCode;
 import com.fzm.common.exception.GlobalException;
 import com.fzm.common.mapper.UserMapper;
 import com.fzm.common.params.LoginParam;
-import com.fzm.common.properties.OssProperties;
 import com.fzm.common.properties.SmsProperties;
 import com.fzm.common.service.AuthPersonService;
 import com.fzm.common.service.UserService;
@@ -84,8 +83,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Resource
     private ObsUtil obsUtil;
 
-    @Resource
-    private OssProperties ossProperties;
 
     @Override
     public User loadUserByUsername(String username) {

sql/joying.sql

@@ -650,3 +650,16 @@ CREATE TABLE `tb_refund` (
                              `update_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
                              PRIMARY KEY (`id`)
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+DROP TABLE IF EXISTS `tb_charge`;
+CREATE TABLE `tb_charge`  (
+                              `id` int(11) NOT NULL AUTO_INCREMENT,
+                              `fee` bigint(19) NOT NULL DEFAULT 0 COMMENT '费用(分)',
+                              `type` tinyint(1) NOT NULL COMMENT '收费类型 1-nft发行 2-版权申请',
+                              PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of tb_charge
+-- ----------------------------
+INSERT INTO `tb_charge` VALUES (1, 0, 1);
+INSERT INTO `tb_charge` VALUES (2, 0, 2);
\ No newline at end of file