上线测试准备

pom.xml

@@ -9,7 +9,7 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.caimei</groupId>
-    <artifactId>www</artifactId>
+    <artifactId>caimei365-www</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>www</name>
     <description>Demo project for Spring Boot</description>

src/main/java/com/caimei/www/filter/CustomWebFilter.java → src/main/java/com/caimei/www/config/CustomWebFilter.java

@@ -1,4 +1,4 @@
-package com.caimei.www.filter;
+package com.caimei.www.config;
 
 import org.springframework.stereotype.Component;
 import org.springframework.web.server.ServerWebExchange;
@@ -19,6 +19,9 @@ public class CustomWebFilter implements WebFilter {
     if ("/".equals(exchange.getRequest().getURI().getPath())) {
         return chain.filter(exchange.mutate().request(exchange.getRequest().mutate().path("/index.html").build()).build());
     }
+    if ("/favicon.ico".equals(exchange.getRequest().getURI().getPath())) {
+        return chain.filter(exchange.mutate().request(exchange.getRequest().mutate().path("/favicon.ico").build()).build());
+    }
     return chain.filter(exchange);
   }
 }

src/main/java/com/caimei/www/service/impl/AccountServiceImpl.java

@@ -2,6 +2,7 @@ package com.caimei.www.service.impl;
 
 import com.caimei.www.mapper.AccountDao;
 import com.caimei.www.service.AccountService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -12,6 +13,7 @@ import javax.annotation.Resource;
  * @author : Charles
  * @date : 2020/7/24
  */
+@Slf4j
 @Service
 public class AccountServiceImpl implements AccountService {
     @Resource

src/main/java/com/caimei/www/service/impl/BaseServiceImpl.java

@@ -5,6 +5,7 @@ import com.caimei.www.mapper.BaseDao;
 import com.caimei.www.pojo.page.*;
 import com.caimei.www.service.BaseService;
 import com.caimei.www.utils.ImageUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -21,6 +22,7 @@ import java.util.stream.Collectors;
  * @author : Charles
  * @date : 2020/6/16
  */
+@Slf4j
 @Service
 public class BaseServiceImpl implements BaseService {
     @Resource

src/main/java/com/caimei/www/service/impl/HomeServiceImpl.java

@@ -8,6 +8,7 @@ import com.caimei.www.pojo.page.ProductList;
 import com.caimei.www.service.HomeService;
 import com.caimei.www.utils.ImageUtil;
 import com.caimei.www.utils.PriceUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -23,6 +24,7 @@ import java.util.Map;
  * @author : Charles
  * @date : 2020/6/22
  */
+@Slf4j
 @Service
 public class HomeServiceImpl implements HomeService {
     @Resource

src/main/java/com/caimei/www/service/impl/InstrumentServiceImpl.java

@@ -9,6 +9,7 @@ import com.caimei.www.pojo.page.PageFloor;
 import com.caimei.www.pojo.page.Parameter;
 import com.caimei.www.service.InstrumentService;
 import com.caimei.www.utils.ImageUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -22,6 +23,7 @@ import java.util.List;
  * @author : Charles
  * @date : 2020/7/16
  */
+@Slf4j
 @Service
 public class InstrumentServiceImpl implements InstrumentService {
     @Resource

src/main/java/com/caimei/www/service/impl/ProductServiceImpl.java

@@ -10,7 +10,7 @@ import com.caimei.www.service.CommonServiceUtil;
 import com.caimei.www.service.ProductService;
 import com.caimei.www.utils.ImageUtil;
 import io.netty.util.internal.StringUtil;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -23,6 +23,7 @@ import java.util.List;
  * @author : Charles
  * @date : 2020/7/8
  */
+@Slf4j
 @Service
 public class ProductServiceImpl implements ProductService {
     @Value("${caimei.wwwDomain}")

src/main/java/com/caimei/www/service/impl/ShoppingServiceImpl.java

@@ -10,6 +10,7 @@ import com.caimei.www.service.CommonServiceUtil;
 import com.caimei.www.service.ShoppingService;
 import com.caimei.www.utils.ImageUtil;
 import com.caimei.www.utils.PriceUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -24,6 +25,7 @@ import java.util.concurrent.atomic.AtomicReference;
  * @author : Charles
  * @date : 2020/7/23
  */
+@Slf4j
 @Service
 public class ShoppingServiceImpl implements ShoppingService {
     @Value("${caimei.wwwDomain}")

src/main/java/com/caimei/www/service/impl/SinglePageServiceImpl.java

@@ -9,6 +9,7 @@ import com.caimei.www.service.SinglePageService;
 import com.caimei.www.utils.ImageUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -30,6 +31,7 @@ import java.util.List;
  * @author : Charles
  * @date : 2020/7/20
  */
+@Slf4j
 @Service
 public class SinglePageServiceImpl implements SinglePageService {
 
@@ -105,19 +107,19 @@ public class SinglePageServiceImpl implements SinglePageService {
             long currentTime = System.currentTimeMillis();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             promotionsList.forEach(item -> {
+                //已结束
+                item.setStatus(3);
+                String format = "";
                 if(null != item.getBeginTime() && null != item.getEndTime() && (item.getEndTime().getTime() > item.getBeginTime().getTime() ) && (item.getBeginTime().getTime() > currentTime)){
                     //即将开始: 活动开始时间小于当前时间
                     item.setStatus(1);
+                    format = sdf.format(item.getBeginTime())+"～"+sdf.format(item.getEndTime());
                 }
                 if(null != item.getBeginTime() && null != item.getEndTime() && (item.getEndTime().getTime() > currentTime ) && (item.getBeginTime().getTime() < currentTime)) {
                     //进行中: 当前时间小于活动开始，小于活动结束时间
                     item.setStatus(2);
+                    format = sdf.format(item.getBeginTime())+"～"+sdf.format(item.getEndTime());
                 }
-                if(null != item.getBeginTime() && null != item.getEndTime() && (currentTime > item.getEndTime().getTime()) && (item.getEndTime().getTime() > item.getBeginTime().getTime())) {
-                    //已结束: 活动结束时间小于结束时间
-                    item.setStatus(3);
-                }
-                String format = sdf.format(item.getBeginTime())+"～"+sdf.format(item.getEndTime());
                 item.setDetail(format);
             });
         }

src/main/java/com/caimei/www/service/impl/SupplierServiceImpl.java

@@ -7,6 +7,7 @@ import com.caimei.www.pojo.page.SupplierDetail;
 import com.caimei.www.service.SupplierService;
 import com.caimei.www.utils.ImageUtil;
 import com.caimei.www.utils.PriceUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,7 @@ import java.util.List;
  * @author : Charles
  * @date : 2020/7/22
  */
+@Slf4j
 @Service
 public class SupplierServiceImpl implements SupplierService {
     @Value("${caimei.wwwDomain}")

src/main/resources/config/beta/application-beta.yml

@@ -38,7 +38,7 @@ spring:
 
 #日志配置
 logging:
-  path: /mnt/newdatadrive/data/runtime/tomcat-instance/www/logs
+  path: /mnt/newdatadrive/data/runtime/tomcat-instance/caimei365-www/logs
   level:
     root: info
 

src/main/resources/config/prod/application-prod.yml

@@ -38,7 +38,7 @@ spring:
 
 #日志配置
 logging:
-  path: /mnt/newdatadrive/data/runtime/tomcat-instance/www/logs
+  path: /mnt/newdatadrive/data/runtime/tomcat-instance/caimei365-www/logs
   level:
     root: info
 

src/main/resources/static/css/base/base.pc.css

@@ -92,7 +92,7 @@ header{box-shadow: 0 2px 10px #ebecef;}
 .baseTopNav>.wrap{height:44px;box-sizing:border-box;position:relative;z-index:991;}
 .baseTopNav .home,.baseTopNav .classBtn,.baseTopNav .navBox{float:left}
 .baseTopNav .service{float:right}
-.baseTopNav .nav{display:inline-block;height:44px;line-height:44px;padding:0 19px;color:#4A4F58;font-size:14px;text-align:center;position:relative;border-left:1px solid transparent;border-right:1px solid transparent}
+.baseTopNav .nav{display:inline-block;height:44px;line-height:44px;padding:0 24px;color:#4A4F58;font-size:14px;text-align:center;position:relative;border-left:1px solid transparent;border-right:1px solid transparent}
 .baseTopNav .nav:hover,.baseTopNav .nav.on{color:#E15616;border-image:-webkit-linear-gradient(white,#E15616,white)1 20 1;border-image:-moz-linear-gradient(white,#E15616,white)1 20 1;border-image:-o-linear-gradient(white,#E15616,white)1 20 1;border-image:linear-gradient(white,#E15616,white)1 20 1}
 .baseTopNav .nav:after{width:20px;height:20px;vertical-align:middle;margin-left:1px}
 .baseTopNav .nav.home:after{background-position:-30px -31px}

src/main/resources/static/css/index/index.h5.css

@@ -4,7 +4,7 @@
 */
 li{list-style:none;}
 /* 首页右侧导航 */
-#advertising,#sideNav{display:none;}
+#advertising,#sideNav{display:none!important;}
 /* 轮播 */
 #swiper-container{width:100%;height:48vw;overflow:hidden;position:relative}
 #swiper-container .swiper-wrapper{position:relative;height:100%;z-index:0}

src/main/resources/templates/components/head-link.html

@@ -5,7 +5,8 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta http-equiv="keywords" content="采美、易耗品商城、光电美容仪器项目、光电中心、皮肤管理中心、光电转型、美容院转型、光电美容">
     <meta http-equiv="description" content="采美365网——中国美业互联网共享经济平台，中国美业较大的光电美容干货信息平台，提供美容专业线客装产品、美容院消耗品、专业线院装产品、光电美容仪器、光电美容项目交易，同时提供采美公益大讲堂、光电美容干货、光电美容资讯、美业动态等行业信息。采集梦想，美启未来。">
-    <link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
+    <link rel="shortcut icon" th:href="@{/favicon.ico}" type="image/x-icon">
+    <link rel="bookmark" th:href="@{/favicon.ico}" type="image/x-icon">
     <link href="/lib/swiper.min.css" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
     <link href="/lib/jquery-confirm.min.css" rel="stylesheet" type="text/css">
     <link th:href="@{/css/base/init.css(v=${version})}" rel="stylesheet" type="text/css">

src/main/resources/templates/index.html

@@ -29,23 +29,20 @@
         <ul class="mfw">
             <!--导航菜单-->
             <li class="first" th:each="menu: ${topMenuList}">
-                <a class="nav mIcon" href="javascript:void(0);" @click="showSubNav($event)">
+                <a th:if="${menu.link}" class="nav mIcon" th:href="${menu.link}"><span th:text="${menu.name}"></span></a>
+                <a th:unless="${menu.link}" class="nav mIcon" href="javascript:void(0);" @click="showSubNav($event)">
                     <span th:text="${menu.name}"></span>
                 </a>
                 <div class="navItem" th:if="${not #lists.isEmpty(menu.subMenus)}">
                     <div class="mfw">
-                        <a class="second" th:each="sub: ${menu.subMenus}" href="javascript:void(0);">
-                            <img th:src="${sub.image}">
-                            <span th:text="${sub.name}"></span>
-                        </a>
-                        <a class="second" th:each="sub: ${menu.subMenus}" href="javascript:void(0);">
+                        <a class="second" th:each="sub: ${menu.subMenus}" th:href="${sub.link}">
                             <img th:src="${sub.image}">
                             <span th:text="${sub.name}"></span>
                         </a>
                     </div>
                 </div>
             </li>
-            <li class="first"><a class="nav mIcon" href="/"><span>维修</span></a></li>
+            <li class="first"><a class="nav mIcon" href="/maintenance/index.html"><span>维修</span></a></li>
         </ul>
     </div>
     <!--页面主体数据-->
@@ -105,7 +102,7 @@
                     <div class="floorCon">
                         <ul class="floorList clear mfw">
                             <li v-for="floor in bigTopic.floorData" style="display: inline-block">
-                                <a href="javascript:void(0);">
+                                <a :href="floor.link">
                                     <img :src="floor.image" :alt="floor.title">
                                     <p v-text="floor.title"></p>
                                 </a>
@@ -117,13 +114,13 @@
             <div th:if="${item.type}==4">
                 <div class="floorTit">
                     <h2 th:text="${item.title}" data-id="4">专题</h2>
-                    <a class="more" href="javascript:void(0);">更多商品专题</a>
+                    <a class="more" href="/promotions.html">更多商品专题</a>
                 </div>
                 <div class="floorCon">
                     <div id="goodsTopic" class="swiper-container">
                         <ul class="swiper-wrapper" v-cloak>
                             <li class="swiper-slide mfc" v-for="topic in topicData4">
-                                <a href="javascript:void(0);">
+                                <a :href="topic.link">
                                     <img :src="topic.image" :alt="topic.title">
                                 </a>
                             </li>
@@ -138,7 +135,7 @@
                 <!--小专题-->
                 <ul class="mfw">
                     <li v-for="topic in topicData5" style="display: inline-block">
-                        <a href="javascript:void(0);">
+                        <a :href="topic.link">
                             <img :src="topic.image" :alt="topic.title">
                             <p v-text="topic.title"></p>
                         </a>
@@ -155,7 +152,7 @@
                         <ul class="clear mfw">
                             <li><img src="/img/common/goodsup.png"/></li>
                             <li v-for="topic in topicData3" style="display: inline-block">
-                                <a href="javascript:void(0);">
+                                <a :href="topic.link">
                                     <img :src="topic.image" :alt="topic.title">
                                     <p v-text="topic.title"></p>
                                 </a>

src/test/java/com/caimei/www/WwwApplicationTests.java

@@ -26,10 +26,10 @@ class WwwApplicationTests {
 //        Flux.range(1, 10).subscribe(System.out::println);
 //        Flux.interval(Duration.of(10, ChronoUnit.SECONDS)).subscribe(System.out::println);
 
-        Flux.generate(sink -> {
-            sink.next("Hello");
-            sink.complete();
-        }).subscribe(System.out::println);
+//        Flux.generate(sink -> {
+//            sink.next("Hello");
+//            sink.complete();
+//        }).subscribe(System.out::println);
 
 
 //        final Random random = new Random();
@@ -55,59 +55,59 @@ class WwwApplicationTests {
 //        Flux.range(1, 10).bufferWhile(i -> i % 2 == 0).subscribe(System.out::println);
 
 
-        List<String> list = Arrays.asList("item1", "item2");
-        list.forEach(System.out::println);
+//        List<String> list = Arrays.asList("item1", "item2");
+//        list.forEach(System.out::println);
 
     }
 
     @Test
     void test2(){
-        List<String> strs = Arrays.asList("1","4","3","2");
-        // strs.sort((s1,s2) -> s1.compareTo(s2));
-        strs.sort(String::compareTo);
-        strs.forEach(System.out::println);
-    }
-    @Data
-    private static class Student{
-        private String name;
-        private int age;
-        public Student(String name, int age) {
-            this.name = name;
-            this.age = age;
-        }
+//        List<String> strs = Arrays.asList("1","4","3","2");
+//        // strs.sort((s1,s2) -> s1.compareTo(s2));
+//        strs.sort(String::compareTo);
+//        strs.forEach(System.out::println);
     }
+//    @Data
+//    private static class Student{
+//        private String name;
+//        private int age;
+//        public Student(String name, int age) {
+//            this.name = name;
+//            this.age = age;
+//        }
+//    }
 
     @Test
     void test3(){
-        List<Student> students = new ArrayList<>(3);
-        students.add(new Student("路飞", 22));
-        students.add(new Student("红发", 40));
-        students.add(new Student("白胡子", 50));
-
-        List<Student> list = students.stream()
-            .filter(stu -> stu.getAge() < 50)
-            .collect(Collectors.toList());
-        System.out.println(list);
-
-
-        List<String> names = students.stream().map(Student::getName)
-                .collect(Collectors.toList());
-        System.out.println(names);
+//        List<Student> students = new ArrayList<>(3);
+//        students.add(new Student("路飞", 22));
+//        students.add(new Student("红发", 40));
+//        students.add(new Student("白胡子", 50));
+//
+//        List<Student> list = students.stream()
+//            .filter(stu -> stu.getAge() < 50)
+//            .collect(Collectors.toList());
+//        System.out.println(list);
+//
+//
+//        List<String> names = students.stream().map(Student::getName)
+//                .collect(Collectors.toList());
+//        System.out.println(names);
     }
 
     @Test
     void test4(){
-        RestTemplate restTemplate = new RestTemplate();
-        String uri = "https://spi.caimei365.com/search/query/product?keyword=采美";
-        JSONObject forObject = restTemplate.getForObject(uri, JSONObject.class);
-        if(forObject != null){
-            String data = forObject.getString("data");
-
-            JSONObject parse = JSONObject.parseObject(data);
-            Integer total = parse.getInteger("total");
-
-            System.out.println(total);
-        }
+//        RestTemplate restTemplate = new RestTemplate();
+//        String uri = "https://spi.caimei365.com/search/query/product?keyword=采美";
+//        JSONObject forObject = restTemplate.getForObject(uri, JSONObject.class);
+//        if(forObject != null){
+//            String data = forObject.getString("data");
+//
+//            JSONObject parse = JSONObject.parseObject(data);
+//            Integer total = parse.getInteger("total");
+//
+//            System.out.println(total);
+//        }
     }
 
 }