diff --git a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml index f856eb4..c1152fa 100644 --- a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml @@ -7,7 +7,7 @@ select s.*,a.goodsTypeName as categoryName ,b.brandName as brandName; from base_category_brand s - left join base_goods_type a on a.sid =s.ceategorySid - left join base_brand_info b on b.sid= s.brandSid + left join goods_type a on a.sid =s.ceategorySid + left join goods_brand_info b on b.sid= s.brandSid ${ew.sqlSegment} @@ -16,14 +16,14 @@ \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml index 756f689..6d1bd93 100644 --- a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml @@ -7,14 +7,14 @@ \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml index 52945ff..8dc785e 100644 --- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml @@ -6,8 +6,8 @@ select s.*, s.own_spec as ownSpec - from base_goods_sku s + from goods_sku s where s.goodsSpuSid = #{spuSid} @@ -33,8 +33,8 @@ sku.title as goodsSkuTitle, spu.goodsUnitSid, spu.goodsUnitName - from base_goods_sku sku - left join base_goods_spu spu on spu.sid = sku.goodsSpuSid + from goods_sku sku + left join goods_spu spu on spu.sid = sku.goodsSpuSid ${ew.sqlSegment} @@ -54,8 +54,8 @@ a.manufacturerSid, a.goodsUnitName FROM - base_goods_sku s - LEFT JOIN base_goods_spu a + goods_sku s + LEFT JOIN goods_spu a ON a.sid = s.goodsSpuSid ${ew.sqlSegment} diff --git a/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendMapper.xml b/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendMapper.xml index 7c7b607..3639452 100644 --- a/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendMapper.xml @@ -7,8 +7,8 @@ select s.*,s.InventoryAlertUpperLimit as inventoryAlertUpperLimit,s.InventoryAlertLowerLimit as inventoryAlertLowerLimit - from base_goods_sku_extend s + from goods_sku_extend s where s.goodsSkuSid=#{skuSid} \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/goodsspecgroup/GoodsSpecGroupMapper.xml b/src/main/java/com/yxt/goods/biz/goodsspecgroup/GoodsSpecGroupMapper.xml index af30b4c..ecd6459 100644 --- a/src/main/java/com/yxt/goods/biz/goodsspecgroup/GoodsSpecGroupMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsspecgroup/GoodsSpecGroupMapper.xml @@ -6,8 +6,8 @@ select s.*, s.own_spec as ownSpec - from base_goods_sku s + from goods_sku s where s.goodsSpuSid = #{spuSid} \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/goodsspecparam/GoodsSpecParamMapper.xml b/src/main/java/com/yxt/goods/biz/goodsspecparam/GoodsSpecParamMapper.xml index 5114e12..7665adf 100644 --- a/src/main/java/com/yxt/goods/biz/goodsspecparam/GoodsSpecParamMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsspecparam/GoodsSpecParamMapper.xml @@ -6,9 +6,9 @@ select s.*, s.own_spec as ownSpec - from base_goods_sku s + from goods_sku s where s.goodsSpuSid = #{spuSid} \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml index 5806988..201f4e0 100644 --- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml @@ -7,9 +7,9 @@ select s.*,a.goodsTypeName as typeName,b.brandName as brandName,c.manufacturerName as manufacturerName - from base_goods_spu s - left join base_goods_type a on a.sid=s.goodsTypeSid - left join base_brand_info b on b.sid=s.brandSid + from goods_spu s + left join goods_type a on a.sid=s.goodsTypeSid + left join goods_brand_info b on b.sid=s.brandSid left join base_manufacturer c on c.sid=s.manufacturerSid where s.sid=#{sid} diff --git a/src/main/java/com/yxt/goods/biz/goodsspudetail/GoodsSpuDetailMapper.xml b/src/main/java/com/yxt/goods/biz/goodsspudetail/GoodsSpuDetailMapper.xml index 07bca17..eed18b1 100644 --- a/src/main/java/com/yxt/goods/biz/goodsspudetail/GoodsSpuDetailMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsspudetail/GoodsSpuDetailMapper.xml @@ -7,8 +7,8 @@ select s.*,s.generic_spec as genericSpec,s.special_spec as specialSpec - from base_goods_spu_detail s + from goods_spu_detail s where s.goodSpuSid=#{skuSid} diff --git a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml index 5ad69c9..616a606 100644 --- a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml @@ -7,7 +7,7 @@ select * - from base_goods_unit + from goods_unit ${ew.sqlSegment} diff --git a/src/main/resources/application-devv.yml b/src/main/resources/application-dev.yml similarity index 95% rename from src/main/resources/application-devv.yml rename to src/main/resources/application-dev.yml index 30fab1d..3314b33 100644 --- a/src/main/resources/application-devv.yml +++ b/src/main/resources/application-dev.yml @@ -3,7 +3,7 @@ spring: hikari: max-lifetime: 500000 driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://39.104.100.138:3306/yxt_base?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + url: jdbc:mysql://39.104.100.138:3306/ss_goods?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true # url: jdbc:mysql://8.130.39.13:3306/yxt_lpk_yythmall?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true username: root # password: 1LAiGz$t1*Iw diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index cb9c87d..44cddd7 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/yxt_base?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true + url: jdbc:mysql://127.0.0.1:3306/ss_goods?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true username: root password: 1LAiGz$t1*Iw cloud: