diff --git a/README.md b/README.md
index c1def766..c5fdb2b7 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ yshop基于当前流行技术组合的前后端分离商城系统: SpringBoot2
- 可以具体查看演示地址查看当前版本已经完成的功能,不再絮叨啦
#### 项目结构
-项目采用分模块开发方式
+yshop3.0项目采用分模块开发方式
- yshop-app 移动端API模块(H5+uniapp端的API)
- yshop-admin 管理后台模块
- yshop-weixin 微信相关模块
diff --git a/logs/yshop_api/2020-06/debug.2020-06-28.0.log.gz b/logs/yshop_api/2020-06/debug.2020-06-28.0.log.gz
deleted file mode 100644
index fbba9cd0..00000000
Binary files a/logs/yshop_api/2020-06/debug.2020-06-28.0.log.gz and /dev/null differ
diff --git a/logs/yshop_api/2020-06/error.2020-06-27.0.log.gz b/logs/yshop_api/2020-06/error.2020-06-27.0.log.gz
deleted file mode 100644
index 3de7f315..00000000
Binary files a/logs/yshop_api/2020-06/error.2020-06-27.0.log.gz and /dev/null differ
diff --git a/logs/yshop_api/2020-06/info.2020-06-28.0.log.gz b/logs/yshop_api/2020-06/info.2020-06-28.0.log.gz
deleted file mode 100644
index 5253422d..00000000
Binary files a/logs/yshop_api/2020-06/info.2020-06-28.0.log.gz and /dev/null differ
diff --git a/logs/yshop_system/2020-06/debug.2020-06-30.0.log.gz b/logs/yshop_system/2020-06/debug.2020-06-30.0.log.gz
deleted file mode 100644
index f20eba66..00000000
Binary files a/logs/yshop_system/2020-06/debug.2020-06-30.0.log.gz and /dev/null differ
diff --git a/logs/yshop_system/2020-06/error.2020-06-30.0.log.gz b/logs/yshop_system/2020-06/error.2020-06-30.0.log.gz
deleted file mode 100644
index b8b40ccd..00000000
Binary files a/logs/yshop_system/2020-06/error.2020-06-30.0.log.gz and /dev/null differ
diff --git a/logs/yshop_system/2020-06/info.2020-06-30.0.log.gz b/logs/yshop_system/2020-06/info.2020-06-30.0.log.gz
deleted file mode 100644
index f20eba66..00000000
Binary files a/logs/yshop_system/2020-06/info.2020-06-30.0.log.gz and /dev/null differ
diff --git a/pom.xml b/pom.xml
index 05a7b6d5..d9a57ce6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
co.yixiang
yshop
pom
- 3.0-RC2
+ 3.0
yshop-common
diff --git a/yshop-admin/pom.xml b/yshop-admin/pom.xml
index a5b042b8..739e1bd7 100644
--- a/yshop-admin/pom.xml
+++ b/yshop-admin/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.0-RC2
+ 3.0
4.0.0
@@ -21,7 +21,7 @@
co.yixiang
yshop-generator
- 3.0-RC2
+ 3.0
co.yixiang
@@ -32,7 +32,7 @@
co.yixiang
yshop-message
- 3.0-RC2
+ 3.0
co.yixiang
@@ -43,7 +43,7 @@
co.yixiang
yshop-shop
- 3.0-RC2
+ 3.0
org.springframework.boot
diff --git a/yshop-app/pom.xml b/yshop-app/pom.xml
index 357522ff..a7a7cd95 100644
--- a/yshop-app/pom.xml
+++ b/yshop-app/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.0-RC2
+ 3.0
4.0.0
@@ -21,7 +21,7 @@
co.yixiang
yshop-weixin
- 3.0-RC2
+ 3.0
org.springframework.boot
@@ -33,7 +33,7 @@
co.yixiang
yshop-message
- 3.0-RC2
+ 3.0
co.yixiang
diff --git a/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java b/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java
index 0bd0038e..7fb1ce8c 100644
--- a/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java
+++ b/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java
@@ -132,7 +132,7 @@ public class AuthService {
//构建微信用户
WechatUserDto wechatUserDTO = WechatUserDto.builder()
.nickname(nickname)
- .openid(wxMpUser.getOpenId())
+ .routineOpenid(wxMpUser.getOpenId())
.unionId(wxMpUser.getUnionId())
.sex(Integer.valueOf(wxMpUser.getGender()))
.language(wxMpUser.getLanguage())
@@ -151,7 +151,7 @@ public class AuthService {
} else {
returnUser = yxUser;
WechatUserDto wechatUser =yxUser.getWxProfile();
- if ((StrUtil.isBlank(wechatUser.getOpenid()) && StrUtil.isNotBlank(wxMpUser.getOpenId()))
+ if ((StrUtil.isBlank(wechatUser.getRoutineOpenid()) && StrUtil.isNotBlank(wxMpUser.getOpenId()))
|| (StrUtil.isBlank(wechatUser.getUnionId()) && StrUtil.isNotBlank(wxMpUser.getUnionId()))) {
wechatUser.setRoutineOpenid(wxMpUser.getOpenId());
wechatUser.setUnionId(wxMpUser.getUnionId());
@@ -245,6 +245,8 @@ public class AuthService {
userService.setSpread(spread,returnUser.getUid());
+ log.error("spread:{}",spread);
+
return returnUser;
} catch (WxErrorException e) {
diff --git a/yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java b/yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java
index ad65c5a7..62732cc9 100644
--- a/yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java
+++ b/yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java
@@ -191,6 +191,7 @@ public class OrderSupplyService {
jsConfig.put("package",wxPayMpOrderResult.getPackageValue());
jsConfig.put("signType",wxPayMpOrderResult.getSignType());
orderDTO.setJsConfig(jsConfig);
+ map.put("payMsg","订单创建成功");
map.put("result",orderDTO);
return map;
}else if(AppFromEnum.APP.getValue().equals(from)){//app支付
@@ -206,6 +207,7 @@ public class OrderSupplyService {
jsConfig.put("sign",wxPayAppOrderResult.getSign());
orderDTO.setJsConfig(jsConfig);
map.put("result",orderDTO);
+ map.put("payMsg","订单创建成功");
return map;
}else{//公众号
map.put("status","WECHAT_PAY");
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/param/RechargeParam.java b/yshop-app/src/main/java/co/yixiang/modules/user/param/RechargeParam.java
similarity index 73%
rename from yshop-mall/src/main/java/co/yixiang/modules/user/param/RechargeParam.java
rename to yshop-app/src/main/java/co/yixiang/modules/user/param/RechargeParam.java
index 6224eaba..80edb32a 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/user/param/RechargeParam.java
+++ b/yshop-app/src/main/java/co/yixiang/modules/user/param/RechargeParam.java
@@ -3,9 +3,7 @@ package co.yixiang.modules.user.param;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
-import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
@@ -22,8 +20,8 @@ public class RechargeParam implements Serializable {
private String from;
- @NotNull(message = "金额必填")
- @Min(value = 1,message = "充值金额不能低于1")
+ //@NotNull(message = "金额必填")
+ // @Min(value = 1,message = "充值金额不能低于1")
private Double price;
@JsonProperty(value = "paid_price")
diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java
index c23bfd72..d96585ca 100644
--- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java
+++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java
@@ -190,15 +190,13 @@ public class UserController {
}
+ @AuthCheck
@PostMapping("/user/edit")
@ApiOperation(value = "用户修改信息",notes = "用修改信息")
public ApiResult