diff --git a/src/main/java/com/peanut/modules/book/controller/MyUserController.java b/src/main/java/com/peanut/modules/book/controller/MyUserController.java index 9dce45ee..dac526f9 100644 --- a/src/main/java/com/peanut/modules/book/controller/MyUserController.java +++ b/src/main/java/com/peanut/modules/book/controller/MyUserController.java @@ -91,6 +91,15 @@ public class MyUserController { return R.ok().put("user",myUserEntityPage); } + /** + * 管理员添加用户 + * @return + */ + @RequestMapping("/addUserForAdmin") + public R addUserForAdmin(){ + return null; + } + /** * 信息 diff --git a/src/main/java/com/peanut/modules/book/service/impl/PayWechatOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/PayWechatOrderServiceImpl.java index a99fe849..dd88b67f 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/PayWechatOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/PayWechatOrderServiceImpl.java @@ -52,9 +52,9 @@ public class PayWechatOrderServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("order_sn", orderSn); - BuyOrderEntity buyOrder = buyOrderService.getOne(wrapper); + BuyOrder buyOrder = buyOrderService.getOne(wrapper); PayWechatOrderEntity entity = new PayWechatOrderEntity(); entity.setCustomerId(buyOrder.getUserId()); entity.setCreateTime(new Date()); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b544078a..63e506d1 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -17,9 +17,9 @@ spring: type: com.alibaba.druid.pool.DruidDataSource druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/e_book_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true + url: jdbc:mysql://59.110.212.44:3306/e_book_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true username: root - password: password + password: HSXY1234hsxy initial-size: 10 max-active: 100 min-idle: 10