code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!47 优化合并

Browse Source 
Merge pull request !47 from OceansDeep/feature/pg
This commit is contained in:
OceansDeep
2021-11-04 06:46:21 +00:00
committed by Gitee
parent 14ce522539 a44f06b3e8
commit 27efe772ab
33 changed files with 159 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java
View File

@@ -1,41 +1,15 @@
package cn.lili.controller.other;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.json.JSONUtil;
import cn.lili.cache.Cache;
import cn.lili.cache.CachePrefix;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.dos.Brand;
import cn.lili.modules.goods.entity.dos.Category;
import cn.lili.modules.goods.entity.dos.Goods;
import cn.lili.modules.goods.entity.dos.GoodsSku;
import cn.lili.modules.goods.entity.dto.GoodsParamsDTO;
import cn.lili.modules.goods.entity.enums.GoodsAuthEnum;
import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
import cn.lili.modules.goods.service.BrandService;
import cn.lili.modules.goods.service.CategoryService;
import cn.lili.modules.goods.service.GoodsService;
import cn.lili.modules.goods.service.GoodsSkuService;
import cn.lili.modules.promotion.service.PromotionService;
import cn.lili.modules.search.entity.dos.EsGoodsIndex;
import cn.lili.modules.search.service.EsGoodsIndexService;
import cn.lili.modules.store.entity.dos.StoreGoodsLabel;
import cn.lili.modules.store.service.StoreGoodsLabelService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**

8
manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java
View File

@@ -2,7 +2,6 @@ package cn.lili.controller.permission;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.system.aspect.annotation.DemoSite;
import cn.lili.modules.permission.entity.dos.Menu;
import cn.lili.modules.permission.entity.dto.MenuSearchParams;
import cn.lili.modules.permission.entity.vo.MenuVO;
@@ -29,6 +28,7 @@ import java.util.List;
@Api(tags = "管理端,菜单管理接口")
@RequestMapping("/manager/menu")
public class MenuManagerController {
@Autowired
private MenuService menuService;
@@ -43,9 +43,9 @@ public class MenuManagerController {
@DemoSite
public ResultMessage<Menu> add(Menu menu) {
try {
menuService.save(menu);
menuService.saveOrUpdateMenu(menu);
} catch (Exception e) {
log.error("添加菜单错误",e);
log.error("添加菜单错误", e);
}
return ResultUtil.data(menu);
}
@@ -57,7 +57,7 @@ public class MenuManagerController {
@DemoSite
public ResultMessage<Menu> edit(@PathVariable String id, Menu menu) {
menu.setId(id);
menuService.updateById(menu);
menuService.saveOrUpdateMenu(menu);
return ResultUtil.data(menu);
}

3
manager-api/src/main/resources/application.yml
View File

@@ -32,8 +32,7 @@ spring:
# mongodb
data:
mongodb:
host: 127.0.0.1
port: 27017
uri: 127.0.0.1:27017
database: lilishop
username: root
password: lilishop

3
manager-api/src/main/resources/logback-spring.xml
View File

@@ -7,6 +7,7 @@
<springProperty scope="context" name="APP_NAME" source="spring.application.name"/>
<!--日志文件保存路径-->
<springProperty scope="context" name="LOG_FILE_PATH" source="logging.file.path"/>
<springProperty scope="context" name="LOGSTASH_SERVER" source="lili.data.logstash.server"/>
<contextName>${APP_NAME}</contextName>
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -22,7 +23,7 @@
<!--输出到elk的LOGSTASH-->
<appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
<!-- 配置elk日志收集 配饰的是 LOGSTASH 的地址-->
<destination>127.0.0.1:4560</destination>
<destination>${LOGSTASH_SERVER}</destination>
<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
<providers>
<timestamp>

1
manager-api/src/test/java/cn/lili/test/elasticsearch/EsTest.java
View File

@@ -23,7 +23,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.data.elasticsearch.core.SearchPage;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.lang.reflect.Field;