diff --git a/pom.xml b/pom.xml
index ede5a350..ef6ba298 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@
com.github.xiaoymin
swagger-bootstrap-ui
- 1.9.3
+ 1.9.6
diff --git a/yshop-api/pom.xml b/yshop-api/pom.xml
index 7876600e..ee0c6704 100644
--- a/yshop-api/pom.xml
+++ b/yshop-api/pom.xml
@@ -18,12 +18,6 @@
-
- co.yixiang
- yshop-common
- 1.7
-
-
co.yixiang
yshop-tools
diff --git a/yshop-api/src/main/java/co/yixiang/config/SwaggerConfiguration.java b/yshop-api/src/main/java/co/yixiang/config/SwaggerConfiguration.java
deleted file mode 100644
index 7f8034b9..00000000
--- a/yshop-api/src/main/java/co/yixiang/config/SwaggerConfiguration.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package co.yixiang.config;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/**
- * @ClassName SwaggerConfiguration
- * @Author hupeng <610796224@qq.com>
- * @Date 2019/6/28
- **/
-
-@Configuration
-@EnableSwagger2
-public class SwaggerConfiguration {
- @Value("${swagger.enabled}")
- private Boolean enabled;
-
- @Bean
- public Docket createRestApi() {
- return new Docket(DocumentationType.SWAGGER_2)
- .enable(enabled)
- .apiInfo(apiInfo())
- .select()
- .apis(RequestHandlerSelectors.basePackage("co.yixiang.modules"))
- .paths(PathSelectors.any())
- .build();
- }
-
- private ApiInfo apiInfo() {
- return new ApiInfoBuilder()
- .title("yshop商城移动端API")
- .description("yshop商城移动端API")
- .termsOfServiceUrl("http://localhost:8009/api")
- .contact("610796224@qq.com")
- .version("1.6")
- .build();
- }
-}
diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java b/yshop-api/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java
index c40f0902..8a17cc7f 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java
@@ -77,6 +77,8 @@ public interface YxStoreOrderService extends BaseService {
void yuePay(String orderId,int uid);
+ WxPayMpOrderResult wxAppPay(String orderId) throws WxPayException;
+
WxPayMpOrderResult wxPay(String orderId) throws WxPayException;
WxPayMwebOrderResult wxH5Pay(String orderId) throws WxPayException;
diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
index 02969720..4cb038a3 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
@@ -1042,7 +1042,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl authLogin(@RequestParam(value = "code") String code,
@RequestParam(value = "spread") String spread) {
- //todo 分销人
- //String url = "https://h5.dayouqiantu.cn/";
- //wxService.oauth2buildAuthorizationUrl(url, WxConsts.OAuth2Scope.SNSAPI_USERINFO, null);
try {
WxMpOAuth2AccessToken wxMpOAuth2AccessToken = wxService.oauth2getAccessToken(code);
diff --git a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WxMaUserController.java b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WxMaUserController.java
index dc857274..e04e66b3 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WxMaUserController.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WxMaUserController.java
@@ -20,6 +20,7 @@ import co.yixiang.modules.user.web.vo.YxUserQueryVo;
import co.yixiang.utils.EncryptUtils;
import co.yixiang.utils.OrderUtil;
import co.yixiang.utils.RedisUtil;
+import com.vdurmont.emoji.EmojiParser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -62,14 +63,14 @@ public class WxMaUserController {
/**
* 小程序登陆接口
*/
- @PostMapping("/wechat/mp_auth")
+ @PostMapping("/wxapp/auth")
@ApiOperation(value = "小程序登陆",notes = "小程序登陆")
public ApiResult