启动报错

PuffGeek · Aug 9, 2022 · 05f29a2 · 05f29a2
1 parent 26dd8ed
commit 05f29a2
Show file tree

Hide file tree

Showing 15 changed files with 117 additions and 277 deletions.
diff --git a/DB/li_notice_message.sql b/DB/li_notice_message.sql
@@ -7,6 +7,7 @@
  Source Host           : 192.168.0.116:3306
  Source Schema         : lilishop
 
+
  Target Server Type    : MySQL
  Target Server Version : 80023
  File Encoding         : 65001

diff --git a/admin/src/main/resources/application.properties b/admin/src/main/resources/application.properties
@@ -16,9 +16,6 @@ [email protected]
 spring.mail.password=abcdefg123456!@#$%^
 # 日志文件路径
 logging.file.path=lili-logs/admin
-<<<<<<< HEAD
 lili.data.logstash.server=106.124.130.167:4560
-=======
->>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
 # 文件格式
 logging.pattern.file=%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(${PID}){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wEx
diff --git a/config/application.yml b/config/application.yml
@@ -29,7 +29,7 @@ spring:
     type: redis
   # Redis
   redis:
-    host: 127.0.0.1
+    host: 101.43.251.145
     port: 6379
     password: lilishop
     lettuce:
@@ -60,8 +60,7 @@ spring:
       default-datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://192.168.0.116:3306/clerk?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-        url: jdbc:mysql://127.0.0.1:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+        url: jdbc:mysql://101.43.251.145:3306/clerk?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
         username: root
         password: lilishop
         maxActive: 50
@@ -270,7 +269,7 @@ lili:
   data:
     elasticsearch:
       cluster-name: elasticsearch
-      cluster-nodes: 127.0.0.1:9200
+      cluster-nodes: 101.43.251.145:9200
       index:
         number-of-replicas: 0
         number-of-shards: 3
@@ -281,7 +280,7 @@ lili:
     #        password: LiLiShopES
 
     logstash:
-      server: 127.0.0.1:4560
+      server: 101.43.251.145:4560
     rocketmq:
       promotion-topic: lili_promotion_topic
       promotion-group: lili_promotion_group
@@ -302,7 +301,7 @@ lili:
       after-sale-topic: lili_after_sale_topic
       after-sale-group: lili_after_sale_group
 rocketmq:
-  name-server: 127.0.0.1:9876
+  name-server: 101.43.251.145:9876
   isVIPChannel: false
   producer:
     group: lili_group
@@ -311,7 +310,7 @@ rocketmq:
 xxl:
   job:
     admin:
-      addresses: http://127.0.0.1:9001/xxl-job-admin
+      addresses: http://101.43.251.145:9001/xxl-job-admin
     executor:
       appname: xxl-job-executor-lilishop
       address:

diff --git a/framework/src/main/java/cn/lili/cache/CachePrefix.java b/framework/src/main/java/cn/lili/cache/CachePrefix.java
@@ -473,6 +473,10 @@ public enum CachePrefix {
      * 店铺分类
      */
     STORE_CATEGORY,
+    /**
+     * 用户菜单
+     */
+    MENU_USER_ID,
     /**
      * 用户菜单
      * <p>

diff --git a/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java b/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java
@@ -74,15 +74,15 @@ public ResultMessage<Object> handleServiceException(HttpServletRequest request,
         }
         return ResultUtil.error(ResultCode.ERROR.code(), errorMsg);
     }
-
+/*
     @ExceptionHandler(ConstraintViolationException.class)
     @ResponseStatus(value = HttpStatus.BAD_REQUEST)
     public ResultMessage<Object> constraintExceptionHandler(HttpServletRequest request, final Exception e, HttpServletResponse response) {
 
         log.error("全局异常[RuntimeException]:", e);
 
         return ResultUtil.error(001, e.getMessage());
-    }
+    }*/
 
     @ExceptionHandler(RuntimeException.class)
     @ResponseStatus(value = HttpStatus.BAD_REQUEST)

diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
@@ -7,6 +7,7 @@
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.modules.goods.entity.dto.GoodsOperationDTO;
+import cn.lili.modules.goods.entity.dto.GoodsOperationFuLuDTO;
 import cn.lili.modules.goods.entity.enums.GoodsAuthEnum;
 import cn.lili.modules.goods.entity.enums.GoodsSalesModeEnum;
 import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;

diff --git a/framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java b/framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java
@@ -59,14 +59,6 @@ public interface GoodsService extends IService<Goods> {
      */
     void addGoods(GoodsOperationDTO goodsOperationDTO);
 
-
-    /**
-     * 添加福禄商品
-     *
-     * @param goodsOperationFuLuDTO 商品查询条件
-     */
-    void fuLuAddGoods(GoodsOperationFuLuDTO goodsOperationFuLuDTO);
-
     /**
      * 修改商品
      *
@@ -75,14 +67,6 @@ public interface GoodsService extends IService<Goods> {
      */
     void editGoods(GoodsOperationDTO goodsOperationDTO, String goodsId);
 
-    /**
-     * 修改商品
-     *
-     * @param goodsOperationDTO 商品查询条件
-     * @param goodsId           商品ID
-     */
-    void fuLuEditGoods(GoodsOperationFuLuDTO goodsOperationFuLuDTO, String goodsId);
-
     /**
      * 查询商品VO
      *

diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java
@@ -181,30 +181,6 @@ public void addGoods(GoodsOperationDTO goodsOperationDTO) {
     }
 
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void fuLuAddGoods(GoodsOperationFuLuDTO goodsOperationDTO) {
-        Goods goods = new Goods(goodsOperationDTO);
-        //检查商品
-        this.checkGoods(goods);
-        //向goods加入图片
-        if (goodsOperationDTO.getGoodsGalleryList().size() > 0 ) {
-            this.setGoodsGalleryParam(goodsOperationDTO.getGoodsGalleryList().get(0), goods);
-        }
-        //添加商品参数
-        if (goodsOperationDTO.getGoodsParamsDTOList() != null && !goodsOperationDTO.getGoodsParamsDTOList().isEmpty()) {
-            //给商品参数填充值
-            goods.setParams(JSONUtil.toJsonStr(goodsOperationDTO.getGoodsParamsDTOList()));
-        }
-        //添加商品
-        this.save(goods);
-        //添加商品sku信息
-        this.goodsSkuService.add(goodsOperationDTO.getSkuList(), goods);
-        //添加相册
-        if (goodsOperationDTO.getGoodsGalleryList() != null && !goodsOperationDTO.getGoodsGalleryList().isEmpty()) {
-            this.goodsGalleryService.add(goodsOperationDTO.getGoodsGalleryList(), goods.getId());
-        }
-    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -234,32 +210,6 @@ public void editGoods(GoodsOperationDTO goodsOperationDTO, String goodsId) {
     }
 
 
-    @Override
-    public void fuLuEditGoods(GoodsOperationFuLuDTO goodsOperationFuLuDTO, String goodsId) {
-        Goods goods = new Goods(goodsOperationFuLuDTO);
-        goods.setId(goodsId);
-        //检查商品信息
-        this.checkGoods(goods);
-        //向goods加入图片
-        this.setGoodsGalleryParam(goodsOperationFuLuDTO.getGoodsGalleryList().get(0), goods);
-        //添加商品参数
-        if (goodsOperationFuLuDTO.getGoodsParamsDTOList() != null && !goodsOperationFuLuDTO.getGoodsParamsDTOList().isEmpty()) {
-            goods.setParams(JSONUtil.toJsonStr(goodsOperationFuLuDTO.getGoodsParamsDTOList()));
-        }
-        //修改商品
-        this.updateById(goods);
-        //修改商品sku信息
-        this.goodsSkuService.update(goodsOperationFuLuDTO.getSkuList(), goods, goodsOperationFuLuDTO.getRegeneratorSkuFlag());
-        //添加相册
-        if (goodsOperationFuLuDTO.getGoodsGalleryList() != null && !goodsOperationFuLuDTO.getGoodsGalleryList().isEmpty()) {
-            this.goodsGalleryService.add(goodsOperationFuLuDTO.getGoodsGalleryList(), goods.getId());
-        }
-        if (GoodsAuthEnum.TOBEAUDITED.name().equals(goods.getAuthFlag())) {
-            this.deleteEsGoods(Collections.singletonList(goodsId));
-        }
-        cache.remove(CachePrefix.GOODS.getPrefix() + goodsId);
-    }
-
     @Override
     public GoodsVO getGoodsVO(String goodsId) {
         //缓存获取，如果没有则读取缓存

diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/StoreClerkRole.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/StoreClerkRole.java
@@ -4,7 +4,6 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -33,8 +32,5 @@ public StoreClerkRole(String clerkId, String roleId) {
         this.roleId = roleId;
     }
 
-    public StoreClerkRole() {
-
-    }
 }
 
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/ManagerMemberEditDTO.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/ManagerMemberEditDTO.java
@@ -24,6 +24,10 @@ public class ManagerMemberEditDTO {
     @NotNull(message = "用户ID不能为空")
     private String id;
 
+    @ApiModelProperty(value = "会员用户名,用户名不能进行修改", required = true)
+    @NotNull(message = "会员用户名不能为空")
+    private String username;
+
     @ApiModelProperty(value = "会员密码")
     private String password;
 

diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
@@ -24,7 +24,6 @@
  * @since 2020-02-25 14:10:16
  */
 public interface MemberService extends IService<Member> {
-
     /**
      * 默认密码
      */
@@ -97,6 +96,16 @@ public interface MemberService extends IService<Member> {
      */
     Member modifyPass(String memberId, String oldPassword, String newPassword);
 
+    /**
+     * 注册会员
+     *
+     * @param userName    会员
+     * @param password    密码
+     * @param mobilePhone mobilePhone
+     * @return 处理结果
+     */
+    Token register(String userName, String password, String mobilePhone);
+
     /**
      * 是否可以初始化密码
      *
@@ -119,17 +128,6 @@ public interface MemberService extends IService<Member> {
      * @return 操作结果
      */
     void cancellation(String password);
-
-    /**
-     * 注册会员
-     *
-     * @param userName    会员
-     * @param password    密码
-     * @param mobilePhone mobilePhone
-     * @return 处理结果
-     */
-    Token register(String userName, String password, String mobilePhone);
-
     /**
      * 修改当前会员的手机号
      *
@@ -268,7 +266,7 @@ public interface MemberService extends IService<Member> {
      */
     void resetPassword(List<String> ids);
 
-    /*
+    /**
      * 获取所有会员的手机号
      *
      * @return 所有会员的手机号
@@ -283,9 +281,8 @@ public interface MemberService extends IService<Member> {
      */
     boolean updateMemberLoginTime(String memberId);
 
-     /**
+    /**
      * 获取用户VO
-     *
      * @param id 会员id
      * @return 用户VO
      */