Advertising page

src/main/java/com/example/afrishop_v3/controllers/AdvertisementController.java

@@ -6,6 +6,7 @@ import com.example.afrishop_v3.models.TbCfStationItem;
 import com.example.afrishop_v3.repository.AdvertisementItemRepository;
 import com.example.afrishop_v3.repository.AdvertisementRepository;
 import com.example.afrishop_v3.repository.TbCfStationItemRepository;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.data.domain.Sort;
@@ -45,7 +46,7 @@ public class AdvertisementController {
      */
     @GetMapping("/info/{link}")
     public Result getAdvertisementById(@PathVariable("link") String link,
-                                       @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageNum", defaultValue = "0") Integer pageNum,
                                        @RequestParam(value = "pageSize", defaultValue = "12") Integer pageSize,
                                        @RequestParam(value = "order", required = false) String order) {
         LinkedHashMap advertisementMap = new LinkedHashMap();
@@ -71,6 +72,9 @@ public class AdvertisementController {
 
     private Sort sort(String order) {
         String col = "discountPrice";
+        if (StringUtils.isBlank(order)) {
+            col = "sort";
+        }
         return Sort.by(order(order, col));
     }
 

src/main/java/com/example/afrishop_v3/repository/TbCfStationItemRepository.java

@@ -36,7 +36,7 @@ public interface TbCfStationItemRepository extends PagingAndSortingRepository<Tb
 
     List<TbCfStationItem> findAllByItemDescritionId(String id);
 
-    @Query(value = "select i from #{#entityName} i inner join AdvertisementItem a on i.itemId=a.itemId where a.adId=?1  order by a.sort ")
+    @Query(value = "select i from #{#entityName} i inner join AdvertisementItem a on i.itemId=a.itemId where a.adId=?1 ")
     Page<TbCfStationItem> getAdvertisementItem(String adId, Pageable pageable);
 
 }

src/main/resources/application-test.yml

 spring:
   datasource:
-    url: jdbc:mysql://47.106.242.175:3306/afrishop_test?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
+    url: jdbc:mysql://159.138.48.71:3306/chinafrica_ref?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
     username: root
     driver-class-name: com.mysql.cj.jdbc.Driver
-    password: diaoyun666
+    password: Diaoyunnuli.8
 
   redis:
     #Redis数据库分片索引（默认为0）

src/main/resources/application.properties

-server.servlet.context-path=/zion
+server.servlet.context-path=/afrishop
 spring.jpa.hibernate.ddl-auto=update
-server.port = 7000
+server.port = 8099
 #spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3306/afrishop_test?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
 #spring.datasource.username=root
 #spring.datasource.password=Diaoyunnuli.8