diff --git a/sql/wfc_system_db/wfc_system_db.sql b/sql/wfc_system_db/wfc_system_db.sql index 42f7e10..a631046 100644 --- a/sql/wfc_system_db/wfc_system_db.sql +++ b/sql/wfc_system_db/wfc_system_db.sql @@ -489,6 +489,7 @@ INSERT INTO `sys_role_menu` VALUES (2, 2027); INSERT INTO `sys_role_menu` VALUES (2, 2028); INSERT INTO `sys_role_menu` VALUES (2, 2029); INSERT INTO `sys_role_menu` VALUES (2, 2030); +INSERT INTO `sys_role_menu` VALUES (2, 2031); -- ---------------------------- -- Table structure for sys_user diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/SwaggerConfig.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/SwaggerConfig.java index 4cffef8..8d37c0b 100644 --- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/SwaggerConfig.java +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/SwaggerConfig.java @@ -11,21 +11,12 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupp import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.RequestHandlerSelectors; import springfox.documentation.service.ApiInfo; -import springfox.documentation.service.Contact; import springfox.documentation.spi.DocumentationType; import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger2.annotations.EnableSwagger2; import static springfox.documentation.builders.PathSelectors.regex; -/** - *
- * Swagger配置类
- * Created by Binary Wang on 2018/9/27.
- * 
- * - * @author Binary Wang - */ @Configuration @EnableSwagger2 @Slf4j @@ -69,11 +60,7 @@ public class SwaggerConfig extends WebMvcConfigurationSupport implements Environ return new ApiInfoBuilder() .title("WeChat Pay API") .description("WeChat Pay API for Java") - .contact(new Contact("Binary Wang", null, null)) - .license("Apache 2.0") - .licenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html") .version("1.0.0") .build(); } - } \ No newline at end of file diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/WWxPayConfig.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/WWxPayConfig.java index 0a9d3fa..e1f74fd 100644 --- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/WWxPayConfig.java +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/WWxPayConfig.java @@ -5,16 +5,12 @@ import com.github.binarywang.wxpay.service.WxPayService; import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -/** - * @author Binary Wang - */ @Configuration @ConditionalOnClass(WxPayService.class) @EnableConfigurationProperties(WxPayProperties.class) @@ -34,7 +30,7 @@ public class WWxPayConfig { payConfig.setKeyPath(StringUtils.trimToNull(this.properties.getKeyPath())); // 可以指定是否使用沙箱环境 - payConfig.setUseSandboxEnv(false); + payConfig.setUseSandboxEnv(this.properties.getUseSandboxEnv()); WxPayService wxPayService = new WxPayServiceImpl(); wxPayService.setConfig(payConfig); diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/WxPayProperties.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/WxPayProperties.java index 4250d5a..6a14190 100644 --- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/WxPayProperties.java +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/WxPayProperties.java @@ -6,7 +6,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties; /** * wxpay pay properties. * - * @author Binary Wang */ @Data @ConfigurationProperties(prefix = "wxpay") @@ -41,4 +40,9 @@ public class WxPayProperties { */ private String keyPath; + /** + * 可以指定是否使用沙箱环境 + */ + private Boolean useSandboxEnv; + } \ No newline at end of file diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/controller/WxPayController.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/controller/WxPayController.java index 88d4c18..0ced86c 100644 --- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/controller/WxPayController.java +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/controller/WxPayController.java @@ -18,10 +18,7 @@ import java.io.File; import java.util.Date; -/** - * @author Binary Wang - */ -@Api("微信支付") +@Api("WeChat Pay") @RestController @RequestMapping("/payment/wxpay") @AllArgsConstructor @@ -43,7 +40,7 @@ public class WxPayController { * @param transactionId 微信订单号 * @param outTradeNo 商户系统内部的订单号,当没提供transactionId时需要传这个。 */ - @ApiOperation(value = "查询订单") + @ApiOperation(value = "Query order") @GetMapping("/queryOrder") public WxPayOrderQueryResult queryOrder(@RequestParam(required = false) String transactionId, @RequestParam(required = false) String outTradeNo) @@ -51,7 +48,7 @@ public class WxPayController { return this.wxService.queryOrder(transactionId, outTradeNo); } - @ApiOperation(value = "查询订单") + @ApiOperation(value = "Query order") @PostMapping("/queryOrder") public WxPayOrderQueryResult queryOrder(@RequestBody WxPayOrderQueryRequest wxPayOrderQueryRequest) throws WxPayException { return this.wxService.queryOrder(wxPayOrderQueryRequest); @@ -71,13 +68,13 @@ public class WxPayController { * * @param outTradeNo 商户系统内部的订单号 */ - @ApiOperation(value = "关闭订单") + @ApiOperation(value = "Close order") @GetMapping("/closeOrder/{outTradeNo}") public WxPayOrderCloseResult closeOrder(@PathVariable String outTradeNo) throws WxPayException { return this.wxService.closeOrder(outTradeNo); } - @ApiOperation(value = "关闭订单") + @ApiOperation(value = "Close order") @PostMapping("/closeOrder") public WxPayOrderCloseResult closeOrder(@RequestBody WxPayOrderCloseRequest wxPayOrderCloseRequest) throws WxPayException { return this.wxService.closeOrder(wxPayOrderCloseRequest); @@ -119,7 +116,7 @@ public class WxPayController { * @param request 请求对象 * @return 退款操作结果 */ - @ApiOperation(value = "退款") + @ApiOperation(value = "Refund") @PostMapping("/refund") public WxPayRefundResult refund(@RequestBody WxPayRefundRequest request) throws WxPayException { return this.wxService.refund(request); diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/error/ErrorController.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/error/ErrorController.java index f8c65c8..a26dcc5 100644 --- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/error/ErrorController.java +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/error/ErrorController.java @@ -4,14 +4,6 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -/** - *
- * 出错页面控制器
- * Created by Binary Wang on 2018/8/25.
- * 
- * - * @author Binary Wang - */ @Controller @RequestMapping("/error") public class ErrorController { diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/error/ErrorPageConfiguration.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/error/ErrorPageConfiguration.java index ab44186..a91306f 100644 --- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/error/ErrorPageConfiguration.java +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/error/ErrorPageConfiguration.java @@ -6,14 +6,6 @@ import org.springframework.boot.web.server.ErrorPageRegistry; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; -/** - *
- * 配置错误状态与对应访问路径
- * Created by Binary Wang on 2018/8/25.
- * 
- * - * @author Binary Wang - */ @Component public class ErrorPageConfiguration implements ErrorPageRegistrar { @Override diff --git a/wfc-modules/wfc-payment/src/main/resources/application.yml b/wfc-modules/wfc-payment/src/main/resources/application.yml index ea736aa..29d73a1 100644 --- a/wfc-modules/wfc-payment/src/main/resources/application.yml +++ b/wfc-modules/wfc-payment/src/main/resources/application.yml @@ -86,3 +86,4 @@ wxpay: subAppId: #服务商模式下的子商户公众账号ID subMchId: #服务商模式下的子商户号 keyPath: /home/wfc/config/payment/wxpay_key.pem + useSandboxEnv: false