diff --git a/kkmall-common/kkmall-common.iml b/kkmall-common/kkmall-common.iml index 1606508..84ee33d 100644 --- a/kkmall-common/kkmall-common.iml +++ b/kkmall-common/kkmall-common.iml @@ -16,6 +16,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -40,9 +68,7 @@ - - diff --git a/kkmall-common/pom.xml b/kkmall-common/pom.xml index 404a8c9..96fce55 100644 --- a/kkmall-common/pom.xml +++ b/kkmall-common/pom.xml @@ -19,7 +19,31 @@ 1.18.18 2.5 + + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + 2021.1 + pom + import + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + com.baomidou diff --git a/kkmall-coupon/pom.xml b/kkmall-coupon/pom.xml index 175fbae..9536d8f 100644 --- a/kkmall-coupon/pom.xml +++ b/kkmall-coupon/pom.xml @@ -33,7 +33,10 @@ org.springframework.cloud spring-cloud-starter-openfeign - + + org.springframework.cloud + spring-cloud-starter-loadbalancer + org.springframework.boot spring-boot-starter-test diff --git a/kkmall-coupon/src/main/java/name/lkk/kkmall/coupon/KkmallCouponApplication.java b/kkmall-coupon/src/main/java/name/lkk/kkmall/coupon/KkmallCouponApplication.java index 80d4286..d41087b 100644 --- a/kkmall-coupon/src/main/java/name/lkk/kkmall/coupon/KkmallCouponApplication.java +++ b/kkmall-coupon/src/main/java/name/lkk/kkmall/coupon/KkmallCouponApplication.java @@ -3,8 +3,10 @@ package name.lkk.kkmall.coupon; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @SpringBootApplication +@EnableDiscoveryClient @MapperScan("name.lkk.kkmall.coupon.dao") public class KkmallCouponApplication { diff --git a/kkmall-coupon/src/main/java/name/lkk/kkmall/coupon/controller/CouponController.java b/kkmall-coupon/src/main/java/name/lkk/kkmall/coupon/controller/CouponController.java index 70fd1dd..29eca9f 100644 --- a/kkmall-coupon/src/main/java/name/lkk/kkmall/coupon/controller/CouponController.java +++ b/kkmall-coupon/src/main/java/name/lkk/kkmall/coupon/controller/CouponController.java @@ -30,6 +30,12 @@ public class CouponController { @Autowired private CouponService couponService; + @RequestMapping("/member/list") + public R memberCoupons(){ + CouponEntity couponEntity = new CouponEntity(); + couponEntity.setCouponName("满100减10"); + return R.ok().put("coupons", Arrays.asList(couponEntity)); + } /** * 列表 */ diff --git a/kkmall-coupon/src/main/resources/application.yml b/kkmall-coupon/src/main/resources/application.yml index a46b18d..119c2b6 100644 --- a/kkmall-coupon/src/main/resources/application.yml +++ b/kkmall-coupon/src/main/resources/application.yml @@ -5,6 +5,14 @@ spring: url: jdbc:mysql://localhost:3306/kkmall_sms?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: root password: 66CcFf!! + + cloud: + nacos: + discovery: + server-addr: localhost:8848 + application: + name: kkmall-coupon + mybatis-plus: mapper-locations: classpath:/mapper/**/*.xml global-config: diff --git a/kkmall-gateway/pom.xml b/kkmall-gateway/pom.xml new file mode 100644 index 0000000..df719c1 --- /dev/null +++ b/kkmall-gateway/pom.xml @@ -0,0 +1,65 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.5.0 + + + name.lkk.kkmall + kkmall-gateway + 0.0.1-SNAPSHOT + kkmall-gateway + API 网关 + + 1.8 + 2020.0.3 + + + + name.lkk.kkmall + kkmall-common + 0.0.1-SNAPSHOT + + + + com.baomidou + mybatis-plus-boot-starter + + + + + org.springframework.cloud + spring-cloud-starter-gateway + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/kkmall-gateway/src/main/java/name/lkk/kkmall/gateway/KkmallGatewayApplication.java b/kkmall-gateway/src/main/java/name/lkk/kkmall/gateway/KkmallGatewayApplication.java new file mode 100644 index 0000000..92b080e --- /dev/null +++ b/kkmall-gateway/src/main/java/name/lkk/kkmall/gateway/KkmallGatewayApplication.java @@ -0,0 +1,16 @@ +package name.lkk.kkmall.gateway; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; + +@EnableDiscoveryClient +@SpringBootApplication +public class KkmallGatewayApplication { + + public static void main(String[] args) { + SpringApplication.run(KkmallGatewayApplication.class, args); + } + +} diff --git a/kkmall-gateway/src/main/resources/application.yml b/kkmall-gateway/src/main/resources/application.yml new file mode 100644 index 0000000..4d33e6f --- /dev/null +++ b/kkmall-gateway/src/main/resources/application.yml @@ -0,0 +1,21 @@ +spring: + cloud: + nacos: + discovery: + server-addr: localhost:8848 + gateway: + routes: + - id: test_route + uri: http://www.baidu.com + predicates: + - Query=url,baidu + + - id: qq_route + uri: http://www.qq.com + predicates: + - Query=url,qq + + application: + name: kkmall-gateway +server: + port: 88 diff --git a/kkmall-gateway/src/main/resources/bootstrap.yml b/kkmall-gateway/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..7c63457 --- /dev/null +++ b/kkmall-gateway/src/main/resources/bootstrap.yml @@ -0,0 +1,8 @@ +spring: + application: + name: kkmall-gateway + cloud: + nacos: + config: + server-addr: localhost:8848 + namespace: 1491b51d-35bb-4278-8760-80cdbd28eb31 \ No newline at end of file diff --git a/kkmall-gateway/src/test/java/name/lkk/kkmall/gateway/KkmallGatewayApplicationTests.java b/kkmall-gateway/src/test/java/name/lkk/kkmall/gateway/KkmallGatewayApplicationTests.java new file mode 100644 index 0000000..3978a52 --- /dev/null +++ b/kkmall-gateway/src/test/java/name/lkk/kkmall/gateway/KkmallGatewayApplicationTests.java @@ -0,0 +1,13 @@ +package name.lkk.kkmall.gateway; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class KkmallGatewayApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/kkmall-member/pom.xml b/kkmall-member/pom.xml index 6e3bb19..bf47855 100644 --- a/kkmall-member/pom.xml +++ b/kkmall-member/pom.xml @@ -29,10 +29,15 @@ org.springframework.boot spring-boot-starter-web + org.springframework.cloud spring-cloud-starter-openfeign + + org.springframework.cloud + spring-cloud-starter-loadbalancer + org.springframework.boot diff --git a/kkmall-member/src/main/java/name/lkk/kkmall/member/KkmallMemberApplication.java b/kkmall-member/src/main/java/name/lkk/kkmall/member/KkmallMemberApplication.java index 8bfcb2e..6c2590f 100644 --- a/kkmall-member/src/main/java/name/lkk/kkmall/member/KkmallMemberApplication.java +++ b/kkmall-member/src/main/java/name/lkk/kkmall/member/KkmallMemberApplication.java @@ -3,8 +3,12 @@ package name.lkk.kkmall.member; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; @SpringBootApplication +@EnableDiscoveryClient +@EnableFeignClients(basePackages = "name.lkk.kkmall.member.feign") @MapperScan("name.lkk.kkmall.member.dao") public class KkmallMemberApplication { diff --git a/kkmall-member/src/main/java/name/lkk/kkmall/member/controller/MemberController.java b/kkmall-member/src/main/java/name/lkk/kkmall/member/controller/MemberController.java index 8215b3f..71597d0 100644 --- a/kkmall-member/src/main/java/name/lkk/kkmall/member/controller/MemberController.java +++ b/kkmall-member/src/main/java/name/lkk/kkmall/member/controller/MemberController.java @@ -3,6 +3,7 @@ package name.lkk.kkmall.member.controller; import java.util.Arrays; import java.util.Map; +import name.lkk.kkmall.member.feign.CouponFeignService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; @@ -15,6 +16,7 @@ import name.lkk.kkmall.member.service.MemberService; import name.lkk.common.utils.PageUtils; import name.lkk.common.utils.R; +import javax.annotation.Resource; /** @@ -30,6 +32,19 @@ public class MemberController { @Autowired private MemberService memberService; + @Autowired + private CouponFeignService couponFeignService; + + @RequestMapping("/coupons") + public R test(){ + MemberEntity memberEntity = new MemberEntity(); + memberEntity.setNickname("fireNay"); + // 远程调用 + System.out.println(couponFeignService); + R memberCoupons = couponFeignService.memberCoupons(); + return R.ok().put("member", memberEntity).put("coupons", memberCoupons.get("coupons")); + } + /** * 列表 */ diff --git a/kkmall-member/src/main/java/name/lkk/kkmall/member/feign/CouponFeignService.java b/kkmall-member/src/main/java/name/lkk/kkmall/member/feign/CouponFeignService.java new file mode 100644 index 0000000..47a7b17 --- /dev/null +++ b/kkmall-member/src/main/java/name/lkk/kkmall/member/feign/CouponFeignService.java @@ -0,0 +1,18 @@ +package name.lkk.kkmall.member.feign; + +import name.lkk.common.utils.R; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @author: kirklin + * @date: 2021/6/7 9:02 下午 + * @description: + */ +@FeignClient("kkmall-coupon") +public interface CouponFeignService { + + @RequestMapping("/coupon/coupon/member/list") + public R memberCoupons(); + +} diff --git a/kkmall-member/src/main/resources/application.yml b/kkmall-member/src/main/resources/application.yml index c9683b1..8e2f3bc 100644 --- a/kkmall-member/src/main/resources/application.yml +++ b/kkmall-member/src/main/resources/application.yml @@ -5,6 +5,14 @@ spring: url: jdbc:mysql://localhost:3306/kkmall_ums?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: root password: 66CcFf!! + + cloud: + nacos: + discovery: + server-addr: localhost:8848 + application: + name: kkmall-member + mybatis-plus: mapper-locations: classpath:/mapper/**/*.xml global-config: diff --git a/kkmall-order/pom.xml b/kkmall-order/pom.xml index ee76dff..a692a36 100644 --- a/kkmall-order/pom.xml +++ b/kkmall-order/pom.xml @@ -29,10 +29,15 @@ org.springframework.boot spring-boot-starter-web + org.springframework.cloud spring-cloud-starter-openfeign + + org.springframework.cloud + spring-cloud-starter-loadbalancer + org.springframework.boot diff --git a/kkmall-order/src/main/java/name/lkk/kkmall/order/KkmallOrderApplication.java b/kkmall-order/src/main/java/name/lkk/kkmall/order/KkmallOrderApplication.java index 317d4a8..019310b 100644 --- a/kkmall-order/src/main/java/name/lkk/kkmall/order/KkmallOrderApplication.java +++ b/kkmall-order/src/main/java/name/lkk/kkmall/order/KkmallOrderApplication.java @@ -3,8 +3,10 @@ package name.lkk.kkmall.order; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @SpringBootApplication +@EnableDiscoveryClient @MapperScan("name.lkk.kkmall.order.dao") public class KkmallOrderApplication { diff --git a/kkmall-order/src/main/resources/application.yml b/kkmall-order/src/main/resources/application.yml index b1ecebd..22f7685 100644 --- a/kkmall-order/src/main/resources/application.yml +++ b/kkmall-order/src/main/resources/application.yml @@ -5,6 +5,14 @@ spring: url: jdbc:mysql://localhost:3306/kkmall_oms?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: root password: 66CcFf!! + + cloud: + nacos: + discovery: + server-addr: localhost:8848 + application: + name: kkmall-order + mybatis-plus: mapper-locations: classpath:/mapper/**/*.xml global-config: diff --git a/kkmall-product/pom.xml b/kkmall-product/pom.xml index 296f576..16e3c36 100644 --- a/kkmall-product/pom.xml +++ b/kkmall-product/pom.xml @@ -29,10 +29,15 @@ org.springframework.boot spring-boot-starter-web + org.springframework.cloud spring-cloud-starter-openfeign + + org.springframework.cloud + spring-cloud-starter-loadbalancer + org.springframework.boot diff --git a/kkmall-product/src/main/java/name/lkk/kkmall/product/KkmallProductApplication.java b/kkmall-product/src/main/java/name/lkk/kkmall/product/KkmallProductApplication.java index ae227a4..94df1a3 100644 --- a/kkmall-product/src/main/java/name/lkk/kkmall/product/KkmallProductApplication.java +++ b/kkmall-product/src/main/java/name/lkk/kkmall/product/KkmallProductApplication.java @@ -3,6 +3,7 @@ package name.lkk.kkmall.product; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; /** * @author: kirklin @@ -11,6 +12,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; */ @MapperScan("name.lkk.kkmall.product.dao") @SpringBootApplication +@EnableDiscoveryClient public class KkmallProductApplication { public static void main(String[] args) { diff --git a/kkmall-product/src/main/java/name/lkk/kkmall/product/controller/CategoryController.java b/kkmall-product/src/main/java/name/lkk/kkmall/product/controller/CategoryController.java index 4d10876..8e58a3f 100644 --- a/kkmall-product/src/main/java/name/lkk/kkmall/product/controller/CategoryController.java +++ b/kkmall-product/src/main/java/name/lkk/kkmall/product/controller/CategoryController.java @@ -1,6 +1,7 @@ package name.lkk.kkmall.product.controller; import java.util.Arrays; +import java.util.List; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; @@ -31,16 +32,25 @@ public class CategoryController { private CategoryService categoryService; /** - * 列表 + * 树形列表 */ - @RequestMapping("/list") - //@RequiresPermissions("product:category:list") - public R list(@RequestParam Map params){ - PageUtils page = categoryService.queryPage(params); - - return R.ok().put("page", page); + @RequestMapping("/list/tree") + public R list(){ + List entities = categoryService.listWithTree(); + return R.ok().put("page", entities); } +// /** +// * 列表 +// */ +// @RequestMapping("/list") +// //@RequiresPermissions("product:category:list") +// public R list(@RequestParam Map params){ +// PageUtils page = categoryService.queryPage(params); +// +// return R.ok().put("page", page); +// } + /** * 信息 diff --git a/kkmall-product/src/main/java/name/lkk/kkmall/product/entity/CategoryEntity.java b/kkmall-product/src/main/java/name/lkk/kkmall/product/entity/CategoryEntity.java index 0b97cd7..a8d01c0 100644 --- a/kkmall-product/src/main/java/name/lkk/kkmall/product/entity/CategoryEntity.java +++ b/kkmall-product/src/main/java/name/lkk/kkmall/product/entity/CategoryEntity.java @@ -1,10 +1,13 @@ package name.lkk.kkmall.product.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; +import java.util.List; + import lombok.Data; /** @@ -56,5 +59,10 @@ public class CategoryEntity implements Serializable { * 商品数量 */ private Integer productCount; + /** + * 商品子分类 + */ + @TableField(exist = false) + private List children; } diff --git a/kkmall-product/src/main/java/name/lkk/kkmall/product/service/CategoryService.java b/kkmall-product/src/main/java/name/lkk/kkmall/product/service/CategoryService.java index 2be3d79..9934ac4 100644 --- a/kkmall-product/src/main/java/name/lkk/kkmall/product/service/CategoryService.java +++ b/kkmall-product/src/main/java/name/lkk/kkmall/product/service/CategoryService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import name.lkk.common.utils.PageUtils; import name.lkk.kkmall.product.entity.CategoryEntity; +import java.util.List; import java.util.Map; /** @@ -16,5 +17,20 @@ import java.util.Map; public interface CategoryService extends IService { PageUtils queryPage(Map params); + + /** + * 查出所有分类 以及子分类，以树形结构组装起来 + * @return + */ + List listWithTree(); + + + /** + * 递归找所有的子菜单、中途要排序 + * @param root + * @param all + * @return + */ + List getChildrens(CategoryEntity root, List all); } diff --git a/kkmall-product/src/main/java/name/lkk/kkmall/product/service/impl/CategoryServiceImpl.java b/kkmall-product/src/main/java/name/lkk/kkmall/product/service/impl/CategoryServiceImpl.java index cc03b01..e9ec598 100644 --- a/kkmall-product/src/main/java/name/lkk/kkmall/product/service/impl/CategoryServiceImpl.java +++ b/kkmall-product/src/main/java/name/lkk/kkmall/product/service/impl/CategoryServiceImpl.java @@ -1,7 +1,12 @@ package name.lkk.kkmall.product.service.impl; import org.springframework.stereotype.Service; + +import java.util.Comparator; +import java.util.List; import java.util.Map; +import java.util.stream.Collectors; + import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -26,4 +31,40 @@ public class CategoryServiceImpl extends ServiceImpl listWithTree() { + List entities = baseMapper.selectList(null); + // 筛选出所有一级分类 + List level1Menus = entities.stream(). + filter((categoryEntity) -> categoryEntity.getParentCid() == 0) + .map((menu) -> { + menu.setChildren(getChildrens(menu, entities)); + return menu; + }).sorted(Comparator.comparingInt(menu -> (menu.getSort() == null ? 0 : menu.getSort()))) + .collect(Collectors.toList()); + + return level1Menus; + } + + /** + * 递归找所有的子菜单、中途要排序 + * @param root + * @param all + * @return + */ + @Override + public List getChildrens(CategoryEntity root, List all){ + List children = all.stream().filter(categoryEntity -> + categoryEntity.getParentCid() == root.getCatId() + ).map(categoryEntity -> { + categoryEntity.setChildren(getChildrens(categoryEntity, all)); + return categoryEntity; + }).sorted(Comparator.comparingInt(menu -> (menu.getSort() == null ? 0 : menu.getSort()))).collect(Collectors.toList()); + return children; + } + } \ No newline at end of file diff --git a/kkmall-product/src/main/resources/application.yml b/kkmall-product/src/main/resources/application.yml index 8981df6..5e98ac8 100644 --- a/kkmall-product/src/main/resources/application.yml +++ b/kkmall-product/src/main/resources/application.yml @@ -5,6 +5,14 @@ spring: url: jdbc:mysql://localhost:3306/kkmall_pms?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: root password: 66CcFf!! + + cloud: + nacos: + discovery: + server-addr: localhost:8848 + application: + name: kkmall-product + mybatis-plus: mapper-locations: classpath:/mapper/**/*.xml global-config: diff --git a/kkmall-ware/pom.xml b/kkmall-ware/pom.xml index 63ceee9..199483b 100644 --- a/kkmall-ware/pom.xml +++ b/kkmall-ware/pom.xml @@ -29,10 +29,15 @@ org.springframework.boot spring-boot-starter-web + org.springframework.cloud spring-cloud-starter-openfeign + + org.springframework.cloud + spring-cloud-starter-loadbalancer + org.springframework.boot diff --git a/kkmall-ware/src/main/java/name/lkk/kkmall/ware/KkmallWareApplication.java b/kkmall-ware/src/main/java/name/lkk/kkmall/ware/KkmallWareApplication.java index 0f27af8..4946adc 100644 --- a/kkmall-ware/src/main/java/name/lkk/kkmall/ware/KkmallWareApplication.java +++ b/kkmall-ware/src/main/java/name/lkk/kkmall/ware/KkmallWareApplication.java @@ -3,8 +3,10 @@ package name.lkk.kkmall.ware; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @SpringBootApplication +@EnableDiscoveryClient @MapperScan("name.lkk.kkmall.ware.dao") public class KkmallWareApplication { diff --git a/kkmall-ware/src/main/resources/application.yml b/kkmall-ware/src/main/resources/application.yml index 5696785..b4e07f3 100644 --- a/kkmall-ware/src/main/resources/application.yml +++ b/kkmall-ware/src/main/resources/application.yml @@ -5,6 +5,14 @@ spring: url: jdbc:mysql://localhost:3306/kkmall_wms?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: root password: 66CcFf!! + + cloud: + nacos: + discovery: + server-addr: localhost:8848 + application: + name: kkmall-ware + mybatis-plus: mapper-locations: classpath:/mapper/**/*.xml global-config: diff --git a/renren-fast-vue/src/views/modules/product/category.vue b/renren-fast-vue/src/views/modules/product/category.vue new file mode 100644 index 0000000..edff625 --- /dev/null +++ b/renren-fast-vue/src/views/modules/product/category.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/renren-fast-vue/static/config/index.js b/renren-fast-vue/static/config/index.js index aca2f56..934abfe 100644 --- a/renren-fast-vue/static/config/index.js +++ b/renren-fast-vue/static/config/index.js @@ -5,7 +5,7 @@ window.SITE_CONFIG = {}; // api接口请求地址 - window.SITE_CONFIG['baseUrl'] = 'http://localhost:8080/renren-fast'; + window.SITE_CONFIG['baseUrl'] = 'http://localhost:88'; // cdn地址 = 域名 + 版本号 window.SITE_CONFIG['domain'] = './'; // 域名 diff --git a/renren-fast/pom.xml b/renren-fast/pom.xml index 40878a4..1fa65a6 100644 --- a/renren-fast/pom.xml +++ b/renren-fast/pom.xml @@ -11,15 +11,16 @@ org.springframework.boot spring-boot-starter-parent - 2.2.4.RELEASE + 2.5.0 UTF-8 UTF-8 1.8 + 2020.0.3 3.3.1 - 8.0.17 + 8.0.23 4.0 11.2.0.3 1.1.13 @@ -40,7 +41,7 @@ 2.8.5 1.2.72 4.1.1 - 1.18.4 + 1.18.18 /work/renren @@ -49,8 +50,29 @@ root 123456 - + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + name.lkk.kkmall + kkmall-common + 0.0.1-SNAPSHOT + + + + org.springframework.boot + spring-boot-starter-validation + + org.springframework.boot spring-boot-starter-test diff --git a/renren-fast/src/main/java/io/renren/RenrenApplication.java b/renren-fast/src/main/java/io/renren/RenrenApplication.java index 915d6cb..59276bc 100644 --- a/renren-fast/src/main/java/io/renren/RenrenApplication.java +++ b/renren-fast/src/main/java/io/renren/RenrenApplication.java @@ -10,9 +10,11 @@ package io.renren; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @SpringBootApplication +@EnableDiscoveryClient public class RenrenApplication { public static void main(String[] args) { diff --git a/renren-fast/src/main/resources/application.yml b/renren-fast/src/main/resources/application.yml index 104a635..6eea6be 100644 --- a/renren-fast/src/main/resources/application.yml +++ b/renren-fast/src/main/resources/application.yml @@ -39,7 +39,12 @@ spring: throw-exception-if-no-handler-found: true # resources: # add-mappings: false - + cloud: + nacos: + discovery: + server-addr: localhost:8848 + application: + name: kkmall-admin #mybatis mybatis-plus: