diff --git a/.gitignore b/.gitignore index 461f5cc5..17b10f69 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ fx.jpg poster.jpg simsunb.ttf spy.log -Alibaba-PuHuiTi-Regular.otf \ No newline at end of file +Alibaba-PuHuiTi-Regular.otf +*/application.yml \ No newline at end of file diff --git a/Alibaba-PuHuiTi-Regular.otf b/Alibaba-PuHuiTi-Regular.otf deleted file mode 100644 index 5960ba12..00000000 Binary files a/Alibaba-PuHuiTi-Regular.otf and /dev/null differ diff --git a/fx.jpg b/fx.jpg deleted file mode 100644 index 739d0c17..00000000 Binary files a/fx.jpg and /dev/null differ diff --git a/poster.jpg b/poster.jpg deleted file mode 100644 index 7687578a..00000000 Binary files a/poster.jpg and /dev/null differ diff --git a/simsunb.ttf b/simsunb.ttf deleted file mode 100644 index 1c14f7fa..00000000 Binary files a/simsunb.ttf and /dev/null differ diff --git a/spy.log b/spy.log deleted file mode 100644 index ed5f0e84..00000000 --- a/spy.log +++ /dev/null @@ -1,57 +0,0 @@ -1571474393700|11|statement|connection 0|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|select 1|select 1 -1571474393713|0|statement|connection 1|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|select 1|select 1 -1571474393721|0|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|select 1|select 1 -1571474399442|1|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|select visits0_.id as id1_8_, visits0_.create_time as create_t2_8_, visits0_.date as date3_8_, visits0_.ip_counts as ip_count4_8_, visits0_.pv_counts as pv_count5_8_, visits0_.week_day as week_day6_8_ from visits visits0_ where visits0_.date=?|select visits0_.id as id1_8_, visits0_.create_time as create_t2_8_, visits0_.date as date3_8_, visits0_.ip_counts as ip_count4_8_, visits0_.pv_counts as pv_count5_8_, visits0_.week_day as week_day6_8_ from visits visits0_ where visits0_.date='2019-10-19' -1571474406194|0|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = ?)|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = 'routine_home_banner') -1571474406203|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474406207|0|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = ?)|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = 'routine_home_menus') -1571474406208|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474406211|0|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = ?)|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = 'routine_home_activity') -1571474406212|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474406219|0|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,menu_name,sort,value,status FROM yx_system_config WHERE (menu_name = ?)|SELECT id,menu_name,sort,value,status FROM yx_system_config WHERE (menu_name = 'wechat_logo') -1571474406220|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474406233|2|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,add_time,ot_price,mer_use,description,is_postage,is_best,sales,price,is_bargain,vip_price,store_name,stock,keyword,image,cost,is_good,unit_name,is_benefit,give_integral,is_new,sort,slider_image,is_show,bar_code,postage,soure_link,code_path,cate_id,is_seckill,mer_id,ficti,store_info,is_del,is_hot,browse FROM yx_store_product WHERE (is_del = ? AND is_show = ? AND is_best = ?) ORDER BY sort DESC|SELECT id,add_time,ot_price,mer_use,description,is_postage,is_best,sales,price,is_bargain,vip_price,store_name,stock,keyword,image,cost,is_good,unit_name,is_benefit,give_integral,is_new,sort,slider_image,is_show,bar_code,postage,soure_link,code_path,cate_id,is_seckill,mer_id,ficti,store_info,is_del,is_hot,browse FROM yx_store_product WHERE (is_del = 0 AND is_show = 1 AND is_best = 1) ORDER BY sort DESC -1571474406237|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474406241|1|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,add_time,ot_price,mer_use,description,is_postage,is_best,sales,price,is_bargain,vip_price,store_name,stock,keyword,image,cost,is_good,unit_name,is_benefit,give_integral,is_new,sort,slider_image,is_show,bar_code,postage,soure_link,code_path,cate_id,is_seckill,mer_id,ficti,store_info,is_del,is_hot,browse FROM yx_store_product WHERE (is_del = ? AND is_show = ? AND is_benefit = ?) ORDER BY sort DESC|SELECT id,add_time,ot_price,mer_use,description,is_postage,is_best,sales,price,is_bargain,vip_price,store_name,stock,keyword,image,cost,is_good,unit_name,is_benefit,give_integral,is_new,sort,slider_image,is_show,bar_code,postage,soure_link,code_path,cate_id,is_seckill,mer_id,ficti,store_info,is_del,is_hot,browse FROM yx_store_product WHERE (is_del = 0 AND is_show = 1 AND is_benefit = 1) ORDER BY sort DESC -1571474406244|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474406247|0|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,add_time,ot_price,mer_use,description,is_postage,is_best,sales,price,is_bargain,vip_price,store_name,stock,keyword,image,cost,is_good,unit_name,is_benefit,give_integral,is_new,sort,slider_image,is_show,bar_code,postage,soure_link,code_path,cate_id,is_seckill,mer_id,ficti,store_info,is_del,is_hot,browse FROM yx_store_product WHERE (is_del = ? AND is_show = ? AND is_hot = ?) ORDER BY sort DESC|SELECT id,add_time,ot_price,mer_use,description,is_postage,is_best,sales,price,is_bargain,vip_price,store_name,stock,keyword,image,cost,is_good,unit_name,is_benefit,give_integral,is_new,sort,slider_image,is_show,bar_code,postage,soure_link,code_path,cate_id,is_seckill,mer_id,ficti,store_info,is_del,is_hot,browse FROM yx_store_product WHERE (is_del = 0 AND is_show = 1 AND is_hot = 1) ORDER BY sort DESC -1571474406250|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474406252|0|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = ?)|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = 'routine_home_menus') -1571474406254|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474486877|10|statement|connection 0|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|select 1|select 1 -1571474486887|0|statement|connection 1|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|select 1|select 1 -1571474486894|0|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|select 1|select 1 -1571474491672|1|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|select visits0_.id as id1_8_, visits0_.create_time as create_t2_8_, visits0_.date as date3_8_, visits0_.ip_counts as ip_count4_8_, visits0_.pv_counts as pv_count5_8_, visits0_.week_day as week_day6_8_ from visits visits0_ where visits0_.date=?|select visits0_.id as id1_8_, visits0_.create_time as create_t2_8_, visits0_.date as date3_8_, visits0_.ip_counts as ip_count4_8_, visits0_.pv_counts as pv_count5_8_, visits0_.week_day as week_day6_8_ from visits visits0_ where visits0_.date='2019-10-19' -1571474498217|1|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = ?)|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = 'routine_home_banner') -1571474498227|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474498230|0|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = ?)|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = 'routine_home_menus') -1571474498231|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474498234|0|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = ?)|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = 'routine_home_activity') -1571474498234|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474498242|0|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,menu_name,sort,value,status FROM yx_system_config WHERE (menu_name = ?)|SELECT id,menu_name,sort,value,status FROM yx_system_config WHERE (menu_name = 'wechat_logo') -1571474498243|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474498254|2|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,add_time,ot_price,mer_use,description,is_postage,is_best,sales,price,is_bargain,vip_price,store_name,stock,keyword,image,cost,is_good,unit_name,is_benefit,give_integral,is_new,sort,slider_image,is_show,bar_code,postage,soure_link,code_path,cate_id,is_seckill,mer_id,ficti,store_info,is_del,is_hot,browse FROM yx_store_product WHERE (is_del = ? AND is_show = ? AND is_best = ?) ORDER BY sort DESC|SELECT id,add_time,ot_price,mer_use,description,is_postage,is_best,sales,price,is_bargain,vip_price,store_name,stock,keyword,image,cost,is_good,unit_name,is_benefit,give_integral,is_new,sort,slider_image,is_show,bar_code,postage,soure_link,code_path,cate_id,is_seckill,mer_id,ficti,store_info,is_del,is_hot,browse FROM yx_store_product WHERE (is_del = 0 AND is_show = 1 AND is_best = 1) ORDER BY sort DESC -1571474498258|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474498261|1|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,add_time,ot_price,mer_use,description,is_postage,is_best,sales,price,is_bargain,vip_price,store_name,stock,keyword,image,cost,is_good,unit_name,is_benefit,give_integral,is_new,sort,slider_image,is_show,bar_code,postage,soure_link,code_path,cate_id,is_seckill,mer_id,ficti,store_info,is_del,is_hot,browse FROM yx_store_product WHERE (is_del = ? AND is_show = ? AND is_benefit = ?) ORDER BY sort DESC|SELECT id,add_time,ot_price,mer_use,description,is_postage,is_best,sales,price,is_bargain,vip_price,store_name,stock,keyword,image,cost,is_good,unit_name,is_benefit,give_integral,is_new,sort,slider_image,is_show,bar_code,postage,soure_link,code_path,cate_id,is_seckill,mer_id,ficti,store_info,is_del,is_hot,browse FROM yx_store_product WHERE (is_del = 0 AND is_show = 1 AND is_benefit = 1) ORDER BY sort DESC -1571474498264|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474498266|0|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,add_time,ot_price,mer_use,description,is_postage,is_best,sales,price,is_bargain,vip_price,store_name,stock,keyword,image,cost,is_good,unit_name,is_benefit,give_integral,is_new,sort,slider_image,is_show,bar_code,postage,soure_link,code_path,cate_id,is_seckill,mer_id,ficti,store_info,is_del,is_hot,browse FROM yx_store_product WHERE (is_del = ? AND is_show = ? AND is_hot = ?) ORDER BY sort DESC|SELECT id,add_time,ot_price,mer_use,description,is_postage,is_best,sales,price,is_bargain,vip_price,store_name,stock,keyword,image,cost,is_good,unit_name,is_benefit,give_integral,is_new,sort,slider_image,is_show,bar_code,postage,soure_link,code_path,cate_id,is_seckill,mer_id,ficti,store_info,is_del,is_hot,browse FROM yx_store_product WHERE (is_del = 0 AND is_show = 1 AND is_hot = 1) ORDER BY sort DESC -1571474498269|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474498272|0|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = ?)|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = 'routine_home_menus') -1571474498273|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474664269|1|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|select 1|select 1 -1571474664274|1|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = ?)|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = 'routine_home_banner') -1571474664276|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474664280|1|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = ?)|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = 'routine_home_menus') -1571474664282|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474664285|0|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = ?)|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = 'routine_home_activity') -1571474664286|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474664289|0|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,menu_name,sort,value,status FROM yx_system_config WHERE (menu_name = ?)|SELECT id,menu_name,sort,value,status FROM yx_system_config WHERE (menu_name = 'wechat_logo') -1571474664290|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474664293|1|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,add_time,ot_price,mer_use,description,is_postage,is_best,sales,price,is_bargain,vip_price,store_name,stock,keyword,image,cost,is_good,unit_name,is_benefit,give_integral,is_new,sort,slider_image,is_show,bar_code,postage,soure_link,code_path,cate_id,is_seckill,mer_id,ficti,store_info,is_del,is_hot,browse FROM yx_store_product WHERE (is_del = ? AND is_show = ? AND is_best = ?) ORDER BY sort DESC|SELECT id,add_time,ot_price,mer_use,description,is_postage,is_best,sales,price,is_bargain,vip_price,store_name,stock,keyword,image,cost,is_good,unit_name,is_benefit,give_integral,is_new,sort,slider_image,is_show,bar_code,postage,soure_link,code_path,cate_id,is_seckill,mer_id,ficti,store_info,is_del,is_hot,browse FROM yx_store_product WHERE (is_del = 0 AND is_show = 1 AND is_best = 1) ORDER BY sort DESC -1571474664300|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474664303|0|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,add_time,ot_price,mer_use,description,is_postage,is_best,sales,price,is_bargain,vip_price,store_name,stock,keyword,image,cost,is_good,unit_name,is_benefit,give_integral,is_new,sort,slider_image,is_show,bar_code,postage,soure_link,code_path,cate_id,is_seckill,mer_id,ficti,store_info,is_del,is_hot,browse FROM yx_store_product WHERE (is_del = ? AND is_show = ? AND is_benefit = ?) ORDER BY sort DESC|SELECT id,add_time,ot_price,mer_use,description,is_postage,is_best,sales,price,is_bargain,vip_price,store_name,stock,keyword,image,cost,is_good,unit_name,is_benefit,give_integral,is_new,sort,slider_image,is_show,bar_code,postage,soure_link,code_path,cate_id,is_seckill,mer_id,ficti,store_info,is_del,is_hot,browse FROM yx_store_product WHERE (is_del = 0 AND is_show = 1 AND is_benefit = 1) ORDER BY sort DESC -1571474664305|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474664309|1|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,add_time,ot_price,mer_use,description,is_postage,is_best,sales,price,is_bargain,vip_price,store_name,stock,keyword,image,cost,is_good,unit_name,is_benefit,give_integral,is_new,sort,slider_image,is_show,bar_code,postage,soure_link,code_path,cate_id,is_seckill,mer_id,ficti,store_info,is_del,is_hot,browse FROM yx_store_product WHERE (is_del = ? AND is_show = ? AND is_hot = ?) ORDER BY sort DESC|SELECT id,add_time,ot_price,mer_use,description,is_postage,is_best,sales,price,is_bargain,vip_price,store_name,stock,keyword,image,cost,is_good,unit_name,is_benefit,give_integral,is_new,sort,slider_image,is_show,bar_code,postage,soure_link,code_path,cate_id,is_seckill,mer_id,ficti,store_info,is_del,is_hot,browse FROM yx_store_product WHERE (is_del = 0 AND is_show = 1 AND is_hot = 1) ORDER BY sort DESC -1571474664311|0|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| -1571474664316|1|statement|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = ?)|SELECT id,group_name,add_time,sort,value,status FROM yx_system_group_data WHERE (group_name = 'routine_home_menus') -1571474664319|1|commit|connection 2|url jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false|| diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java index 6a65baea..571acda6 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java @@ -43,7 +43,7 @@ public class YxUserAddressServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq("is_default",1).eq("uid",uid); + wrapper.eq("is_default",1).eq("uid",uid).eq("is_del",0).last("limit 1"); return getOne(wrapper); } diff --git a/yshop-api/src/main/resources/Alibaba-PuHuiTi-Regular.otf b/yshop-api/src/main/resources/Alibaba-PuHuiTi-Regular.otf deleted file mode 100644 index 5960ba12..00000000 Binary files a/yshop-api/src/main/resources/Alibaba-PuHuiTi-Regular.otf and /dev/null differ diff --git a/yshop-api/src/main/resources/config/application-prod.yml b/yshop-api/src/main/resources/config/application-prod.yml index b0e24ca0..1986b35c 100644 --- a/yshop-api/src/main/resources/config/application-prod.yml +++ b/yshop-api/src/main/resources/config/application-prod.yml @@ -6,7 +6,7 @@ spring: driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy url: jdbc:log4jdbc:mysql://localhost:3306/yshop?serverTimezone=Asia/Shanghai&useSSL=false username: yshop - password: + password: # 初始化配置 initial-size: 3 diff --git a/yshop-api/src/main/resources/fx.jpg b/yshop-api/src/main/resources/fx.jpg deleted file mode 100644 index 739d0c17..00000000 Binary files a/yshop-api/src/main/resources/fx.jpg and /dev/null differ diff --git a/yshop-api/src/main/resources/poster.jpg b/yshop-api/src/main/resources/poster.jpg deleted file mode 100644 index 7687578a..00000000 Binary files a/yshop-api/src/main/resources/poster.jpg and /dev/null differ diff --git a/yshop-api/src/main/resources/simsunb.ttf b/yshop-api/src/main/resources/simsunb.ttf deleted file mode 100644 index 1c14f7fa..00000000 Binary files a/yshop-api/src/main/resources/simsunb.ttf and /dev/null differ