feat: 产品新增优化

hichina-admin-backend/README.md

@@ -0,0 +1,36 @@
+# 后台管理系统
+
+## Environment preparation
+
+### Prerequisite
+
+- JDK 17
+- Gradle 7
+
+### with docker
+
+```shell
+# for logs
+mkdir -p /opt/hichina
+
+# db
+docker run --name mysql_unified_hichina -p 3306:3306 -e MYSQL_ROOT_PASSWORD=Passw0rd -d mysql
+docker exec -it mysql_unified_hichina mysql -u root -p -e "create database unified_hichina" 
+
+docker run --name mongo_unified_hichina -p 27017:27017 -d mongo
+
+docker run --name redis_hichina -p 6379:6379 -d redis
+```
+
+And Run SpringBoot !!!
+
+## Migration
+
+[Liquibase](https://docs.liquibase.com/concepts/introduction-to-liquibase.html) with Spring
+
+See `db/changelog/liquibase-changeLog.xml`
+
+
+
+
+

hichina-admin-backend/build.gradle

@@ -1,5 +1,6 @@
 plugins {
 	id 'java'
+	id 'groovy'
 	id 'org.springframework.boot' version '3.0.2'
 	id 'io.spring.dependency-management' version '1.1.0'
 }
@@ -17,7 +18,6 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
 	implementation 'org.projectlombok:lombok:1.18.20'
-	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	// https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-security
 	implementation 'org.springframework.boot:spring-boot-starter-security:3.0.2'
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
@@ -51,6 +51,15 @@ dependencies {
 	// https://mvnrepository.com/artifact/com.theokanning.openai-gpt3-java/client
 	implementation 'com.theokanning.openai-gpt3-java:client:0.12.0'
 	implementation 'com.lilittlecat:chatgpt:1.0.2'
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.4.0'
+
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testImplementation "org.spockframework:spock-core:2.2-groovy-4.0"
+	testImplementation "org.spockframework:spock-spring:2.2-groovy-4.0"
+	testImplementation 'com.h2database:h2'
+	testImplementation 'de.flapdoodle.embed:de.flapdoodle.embed.mongo.spring3x:4.12.2'
+	testImplementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter-test:3.0.1'
+	testImplementation 'org.springframework.security:spring-security-test'
 }
 
 tasks.named('test') {

hichina-admin-backend/src/main/java/com/hichina/admin/hichinaadminbackend/checker/DateProductAttributeChecker.java

@@ -0,0 +1,21 @@
+package com.hichina.admin.hichinaadminbackend.checker;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+public class DateProductAttributeChecker implements ProductAttributeChecker<Date> {
+
+    @Override
+    public Date check(String value) throws InvalidProductAttributeException {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd", Locale.ENGLISH);
+        Date date;
+        try {
+            date = formatter.parse(value);
+            return date;
+        } catch (ParseException e) {
+            throw new InvalidProductAttributeException("invalid date attribute (yyyy/MM/dd): " + value);
+        }
+    }
+}

hichina-admin-backend/src/main/java/com/hichina/admin/hichinaadminbackend/checker/IntProductAttributeChecker.java

@@ -0,0 +1,14 @@
+package com.hichina.admin.hichinaadminbackend.checker;
+
+import org.apache.commons.lang3.math.NumberUtils;
+
+public class IntProductAttributeChecker implements ProductAttributeChecker<Integer> {
+
+    @Override
+    public Integer check(String value) throws InvalidProductAttributeException {
+        if (!NumberUtils.isDigits(value)) {
+            throw new InvalidProductAttributeException("invalid int attribute: " + value);
+        }
+        return Integer.parseInt(value);
+    }
+}

hichina-admin-backend/src/main/java/com/hichina/admin/hichinaadminbackend/checker/InvalidProductAttributeException.java

@@ -0,0 +1,11 @@
+package com.hichina.admin.hichinaadminbackend.checker;
+
+/**
+ * throws when product attribute value is invalid.
+ */
+public class InvalidProductAttributeException extends Exception {
+
+    public InvalidProductAttributeException(String message) {
+        super(message);
+    }
+}

hichina-admin-backend/src/main/java/com/hichina/admin/hichinaadminbackend/checker/ProductAttributeChecker.java

@@ -0,0 +1,11 @@
+package com.hichina.admin.hichinaadminbackend.checker;
+
+/**
+ * Check whether product attribute is valid.
+ *
+ * @see InvalidProductAttributeException
+ */
+public interface ProductAttributeChecker<T> {
+
+    T check(String value) throws InvalidProductAttributeException;
+}

hichina-admin-backend/src/main/java/com/hichina/admin/hichinaadminbackend/checker/ProductAttributeCheckerFactory.java

@@ -0,0 +1,67 @@
+package com.hichina.admin.hichinaadminbackend.checker;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ProductAttributeCheckerFactory {
+
+    private static ProductAttributeCheckerFactory instance;
+
+    static {
+        instance = new ProductAttributeCheckerFactory();
+        instance.addDataTypeChecker("string", new StringProductAttributeChecker());
+        instance.addDataTypeChecker("image", new StringProductAttributeChecker());
+        instance.addDataTypeChecker("datestring", new StringProductAttributeChecker());
+        instance.addDataTypeChecker("integer", new IntProductAttributeChecker());
+        instance.addDataTypeChecker("date", new DateProductAttributeChecker());
+    }
+
+    /**
+     * attribute id -> checker
+     */
+    private Map<String, ProductAttributeChecker<?>> attributeIdCheckerMap;
+
+    private Map<String, ProductAttributeChecker<?>> dataTypeChekcerMap;
+
+    public ProductAttributeCheckerFactory() {
+        this.attributeIdCheckerMap = new HashMap<>();
+        this.dataTypeChekcerMap = new HashMap<>();
+    }
+
+    public static ProductAttributeCheckerFactory getInstance() {
+        return instance;
+    }
+
+    public void addAttributeIdChecker(String attributeId, ProductAttributeChecker<?> checker) {
+        this.attributeIdCheckerMap.put(attributeId, checker);
+    }
+
+    public void addDataTypeChecker(String dataType, ProductAttributeChecker<?> checker) {
+        this.dataTypeChekcerMap.put(dataType, checker);
+    }
+
+    public ProductAttributeChecker<?> getAttributeChecker(String attributeId, String dateType) {
+        ProductAttributeChecker<?> checker = attributeIdCheckerMap.get(attributeId);
+        if (checker != null) {
+            return checker;
+        }
+
+        checker = dataTypeChekcerMap.get(dateType);
+        if (checker != null) {
+            return checker;
+        }
+        throw new RuntimeException(String.format("unsupported attribute: %s [%s]", attributeId, dateType));
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T> T checkAndConvert(String attributeId, String dateType, String attributeValue) throws InvalidProductAttributeException {
+        ProductAttributeChecker<?> checker = getAttributeChecker(attributeId, dateType);
+        return (T) checker.check(attributeValue);
+    }
+
+    public void check(String attributeId, String dateType, String attributeValue) throws InvalidProductAttributeException {
+        ProductAttributeChecker<?> checker = getAttributeChecker(attributeId, dateType);
+        checker.check(attributeValue);
+    }
+
+}

hichina-admin-backend/src/main/java/com/hichina/admin/hichinaadminbackend/checker/StringProductAttributeChecker.java

@@ -0,0 +1,15 @@
+package com.hichina.admin.hichinaadminbackend.checker;
+
+import org.apache.commons.lang3.StringUtils;
+
+public class StringProductAttributeChecker implements ProductAttributeChecker<String> {
+
+    @Override
+    public String check(String value) throws InvalidProductAttributeException {
+        if (StringUtils.isEmpty(value)) {
+            throw new InvalidProductAttributeException("invalid string attribute (nonempty): " + value);
+        }
+
+        return value;
+    }
+}

hichina-admin-backend/src/main/java/com/hichina/admin/hichinaadminbackend/config/SpringdocConfig.java

@@ -0,0 +1,23 @@
+package com.hichina.admin.hichinaadminbackend.config;
+
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class SpringdocConfig {
+//
+//    @Bean
+//    public GroupedOpenApi publicApi() {
+//        return GroupedOpenApi.builder()
+//                .group("public")
+//                .pathsToMatch("/public/**")
+//                .build();
+//    }
+//
+//    @Bean
+//    public GroupedOpenApi privateApi() {
+//        return GroupedOpenApi.builder()
+//                .group("private")
+//                .pathsToMatch("/private/**")
+//                .build();
+//    }
+}

hichina-admin-backend/src/main/java/com/hichina/admin/hichinaadminbackend/controller/ImageController.java

@@ -33,19 +33,20 @@ public class ImageController {
             String ossDomain = env.getProperty("aliyun.oss.endpoint.domain");
             String accessKeyId = env.getProperty("hichina.root.access.key.id");
             String accessKeySecret = env.getProperty("hichina.root.access.key.secret");
-            OSSClient ossClient = new OSSClient(endpoint, accessKeyId,accessKeySecret);
+            OSSClient ossClient = new OSSClient(endpoint, accessKeyId, accessKeySecret);
 
-            String key = java.util.UUID.randomUUID().toString()+".jpg";
+            String key = java.util.UUID.randomUUID().toString() + ".jpg";
             ossClient.putObject(BLOG_BUCKET_NAME, key, new ByteArrayInputStream(profileBytes));
             ossClient.shutdown();
             ret.setOk(true);
-            String style = expectedType.equals("blogImage")?"blogcontent":"thumbnail";
-            String url = "https://"+BLOG_BUCKET_NAME+"."+ossDomain+"/"+key+"?x-oss-process=style/"+style;
+            String style = expectedType.equals("blogImage") ? "blogcontent" : "thumbnail";
+            String url = "https://" + BLOG_BUCKET_NAME + "." + ossDomain + "/" + key + "?x-oss-process=style/" + style;
             ret.setData(url);
             return ret;
         } catch (IOException e) {
-            LOG.error("=============="+e.getMessage()+"========");
+            LOG.error("==============" + e.getMessage() + "========");
             return null;
         }
     }
+
 }

hichina-admin-backend/src/main/java/com/hichina/admin/hichinaadminbackend/controller/ProductSkuController.java

@@ -1,13 +1,17 @@
 package com.hichina.admin.hichinaadminbackend.controller;
 
 import com.github.pagehelper.PageHelper;
+import com.hichina.admin.hichinaadminbackend.checker.ProductAttributeCheckerFactory;
 import com.hichina.admin.hichinaadminbackend.mapper.*;
 import com.hichina.admin.hichinaadminbackend.model.*;
 import com.hichina.admin.hichinaadminbackend.model.DTO.*;
 import com.hichina.admin.hichinaadminbackend.service.ProductSkuService;
 import com.hichina.admin.hichinaadminbackend.util.UserUtil;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.validation.Valid;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -26,7 +30,8 @@ public class ProductSkuController {
     @Autowired
     private UserUtil userUtil;
 
-    @Autowired ProductSkuGroupMapper productSkuGroupMapper;
+    @Autowired
+    ProductSkuGroupMapper productSkuGroupMapper;
 
     @Autowired
     private ProductSkuTimestampAttributeMappingMapper productSkuTimestampAttributeMappingMapper;
@@ -39,7 +44,7 @@ public class ProductSkuController {
     @Autowired
     private ProductSkuIntAttributeMappingMapper productSkuIntAttributeMappingMapper;
 
-    private ProductPropertyBag changeDateStringFormat(ProductPropertyBag input){
+    private ProductPropertyBag changeDateStringFormat(ProductPropertyBag input) {
         String dateString = input.getAttributeValue();
 
         //2023-03-22 00:00:00
@@ -55,19 +60,21 @@ public class ProductSkuController {
         }
         return input;
     }
+
     /**
      * main logic to get custom property bag, each skuId can have more then 1 property from each typed attribute table
+     *
      * @param skuId
      * @return
      */
-    private List<ProductPropertyBag> getPropertyBagBySkuId(String skuId){
+    private List<ProductPropertyBag> getPropertyBagBySkuId(String skuId) {
         List<ProductPropertyBag> propertyBags = new ArrayList<>();
 
         // TODO: 2023/3/18 if added other type, we should update here
         List<ProductPropertyBag> intPropertyBag = productSkuIntAttributeMappingMapper.findAttributeValueBySkuId(skuId);
         List<ProductPropertyBag> varcharPropertyBag = productSkuVarcharAttributeMappingMapper.findAttributeValueBySkuId(skuId);
         List<ProductPropertyBag> datePropertyBag = productSkuTimestampAttributeMappingMapper.findAttributeValueBySkuId(skuId);
-        datePropertyBag = datePropertyBag.stream().map(r->changeDateStringFormat(r)).collect(Collectors.toList());
+        datePropertyBag = datePropertyBag.stream().map(r -> changeDateStringFormat(r)).collect(Collectors.toList());
 
         propertyBags.addAll(intPropertyBag);
         propertyBags.addAll(varcharPropertyBag);
@@ -83,15 +90,15 @@ public class ProductSkuController {
     }
 
     /**
-    check if all attribute Id in bindedAttributes is covered by propertyBags, otherwise add empty ProductPropertyBag to make up for the lost
+     * check if all attribute Id in bindedAttributes is covered by propertyBags, otherwise add empty ProductPropertyBag to make up for the lost
      */
-    private List<ProductPropertyBag> fillEmptyPropertyBag(List<ProductPropertyBag> propertyBags, List<ProductAttributeTypeShortDTO> bindedAttributes){
-        List<String> existingAttributeIds = propertyBags.stream().map(r ->r.getAttributeId()).collect(Collectors.toList());
+    private List<ProductPropertyBag> fillEmptyPropertyBag(List<ProductPropertyBag> propertyBags, List<ProductAttributeTypeShortDTO> bindedAttributes) {
+        List<String> existingAttributeIds = propertyBags.stream().map(r -> r.getAttributeId()).collect(Collectors.toList());
 
         List<ProductPropertyBag> toAdd = new ArrayList<>();
 
-        for(ProductAttributeTypeShortDTO att : bindedAttributes){
-            if(existingAttributeIds.isEmpty() || (!existingAttributeIds.isEmpty() && !existingAttributeIds.contains(att.getAttributeId()))){
+        for (ProductAttributeTypeShortDTO att : bindedAttributes) {
+            if (existingAttributeIds.isEmpty() || (!existingAttributeIds.isEmpty() && !existingAttributeIds.contains(att.getAttributeId()))) {
                 ProductPropertyBag placeHolderObj = new ProductPropertyBag();
                 placeHolderObj.setAttributeId(att.getAttributeId());
                 placeHolderObj.setDataType(att.getDataType());
@@ -106,7 +113,7 @@ public class ProductSkuController {
     }
 
     @GetMapping("/withpropertybag")
-    public HichinaResponse getProductSkuById(@RequestParam(value="skuId",required = true) String skuId){
+    public HichinaResponse getProductSkuById(@RequestParam(value = "skuId", required = true) String skuId) {
         HichinaResponse ret = new HichinaResponse();
 
         // get the basic property
@@ -114,9 +121,9 @@ public class ProductSkuController {
 
 
         HichinaProductDTO singleSku;
-        if(!singleSkuInList.isEmpty()){
+        if (!singleSkuInList.isEmpty()) {
             singleSku = singleSkuInList.get(0);
-        }else{
+        } else {
             singleSku = null;
         }
 
@@ -126,46 +133,47 @@ public class ProductSkuController {
         data.setHichinaProductDTO(singleSku);
         data.setProductPropertyBag(propertyBags);
 
-        ret.setMessage("成功获取skuId: "+skuId+"的所有属性");
+        ret.setMessage("成功获取skuId: " + skuId + "的所有属性");
         ret.setData(data);
         ret.setOk(true);
 
         return ret;
     }
-    private boolean checkUseMineOnly(String currentUserName){
+
+    private boolean checkUseMineOnly(String currentUserName) {
         AdminUser adminUser = userUtil.currentUser(currentUserName);
         return adminUser.getUsername().startsWith("SP_");
     }
 
     @GetMapping
     public HichinaResponse getProductSkuNoCustomAttributes(@RequestParam(value = "page", required = true) Integer page,
-                                                                @RequestParam(value = "pageSize", required = true) Integer size,
-                                                                @RequestParam(value = "query") String query,
-                                         @RequestParam(value = "productTypeId") String productTypeId){
+                                                           @RequestParam(value = "pageSize", required = true) Integer size,
+                                                           @RequestParam(value = "query") String query,
+                                                           @RequestParam(value = "productTypeId") String productTypeId) {
         HichinaResponse ret = new HichinaResponse();
         String currentUser = userUtil.currentUserName();
         boolean mineOnly = checkUseMineOnly(currentUser);
 
-        if(page>0){
-            PageHelper.startPage(page,size);
+        if (page > 0) {
+            PageHelper.startPage(page, size);
         }
 
 
         List<HichinaProductDTO> rawData;
         int cnt = 0;
-        if(!StringUtils.isEmpty(query)){
-            if(!StringUtils.isEmpty(productTypeId)){
+        if (!StringUtils.isEmpty(query)) {
+            if (!StringUtils.isEmpty(productTypeId)) {
                 rawData = hichinaProductMapper.findByProductTypeIdAndQuery(productTypeId, query, mineOnly, currentUser);
                 cnt = hichinaProductMapper.countByProductTypeIdAndQuery(productTypeId, query, mineOnly, currentUser);
-            }else{
+            } else {
                 rawData = hichinaProductMapper.findByQuery(query, mineOnly, currentUser);
                 cnt = hichinaProductMapper.countByQuery(query, mineOnly, currentUser);
             }
-        }else{
-            if(!StringUtils.isEmpty(productTypeId)){
+        } else {
+            if (!StringUtils.isEmpty(productTypeId)) {
                 rawData = hichinaProductMapper.findByProductTypeId(productTypeId, mineOnly, currentUser);
                 cnt = hichinaProductMapper.countByProductTypeId(productTypeId, mineOnly, currentUser);
-            }else{
+            } else {
                 rawData = hichinaProductMapper.findAllProduct(mineOnly, currentUser);
                 cnt = hichinaProductMapper.count(mineOnly, currentUser);
             }
@@ -182,7 +190,7 @@ public class ProductSkuController {
         return ret;
     }
 
-    private String insertProductSkuInTransaction(ProductSkuCreateDTO request){
+    private String insertProductSkuInTransaction(ProductSkuCreateDTO request) {
         HichinaProduct product = new HichinaProduct();
         product.setProductName(request.getProductName());
         product.setProductContent(request.getProductDescription());
@@ -200,23 +208,23 @@ public class ProductSkuController {
         for (Map.Entry<String, String> entry : request.getCustomPropertyBag().entrySet()) {
             String dataTypeAndAttributeId = entry.getKey();
             String value = entry.getValue();
-            String dataType = dataTypeAndAttributeId.substring(dataTypeAndAttributeId.indexOf("[")+1, dataTypeAndAttributeId.indexOf("]"));
-            String attributeId = dataTypeAndAttributeId.substring(dataTypeAndAttributeId.indexOf("]")+1);
-            if(dataType.equals("string") || dataType.equals("image")  || dataType.equals("datestring")){
+            String dataType = dataTypeAndAttributeId.substring(dataTypeAndAttributeId.indexOf("[") + 1, dataTypeAndAttributeId.indexOf("]"));
+            String attributeId = dataTypeAndAttributeId.substring(dataTypeAndAttributeId.indexOf("]") + 1);
+            if (dataType.equals("string") || dataType.equals("image") || dataType.equals("datestring")) {
                 ProductSkuVarcharAttributeMapping productSkuVarcharAttributeMapping = new ProductSkuVarcharAttributeMapping();
                 productSkuVarcharAttributeMapping.setSkuId(product.getSkuId());
                 productSkuVarcharAttributeMapping.setAttributeValue(value);
                 productSkuVarcharAttributeMapping.setDataType(dataType);
                 productSkuVarcharAttributeMapping.setAttributeId(attributeId);
                 productSkuVarcharAttributeMappingMapper.insert(productSkuVarcharAttributeMapping);
-            }else if(dataType.equals("integer")){
+            } else if (dataType.equals("integer")) {
                 ProductSkuIntAttributeMapping productSkuIntAttributeMapping = new ProductSkuIntAttributeMapping();
                 productSkuIntAttributeMapping.setSkuId(product.getSkuId());
                 productSkuIntAttributeMapping.setAttributeValue(Integer.parseInt(value));
                 productSkuIntAttributeMapping.setDataType(dataType);
                 productSkuIntAttributeMapping.setAttributeId(attributeId);
                 productSkuIntAttributeMappingMapper.insert(productSkuIntAttributeMapping);
-            }else if(dataType.equals("date")){
+            } else if (dataType.equals("date")) {
                 ProductSkuTimestampAttributeMapping productSkuTimestampAttributeMapping = new ProductSkuTimestampAttributeMapping();
                 productSkuTimestampAttributeMapping.setSkuId(product.getSkuId());
                 SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd", Locale.ENGLISH);
@@ -230,16 +238,17 @@ public class ProductSkuController {
                 } catch (ParseException e) {
                     throw new RuntimeException("Invalid date format");
                 }
-            }else{
+            } else {
                 throw new RuntimeException("Not supported data type!");
             }
         }
         productSkuGroupMapper.updateMinPriceAndImage(productSkuGroupId);
         return product.getSkuId();
     }
+
     @PostMapping
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor=Exception.class)
-    public HichinaResponse createProductSku(@RequestBody ProductSkuCreateDTO request){
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+    public HichinaResponse createProductSku(@RequestBody ProductSkuCreateDTO request) {
         HichinaResponse ret = new HichinaResponse();
 
         String skuId = insertProductSkuInTransaction(request);
@@ -251,29 +260,66 @@ public class ProductSkuController {
         return ret;
     }
 
+    @Operation(summary = "批量插入产品sku", description = "批量插入产品sku，配置多个套餐时使用")
+    @PostMapping("/batch")
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+    public ResponseEntity<HiChinaResult<ProductSkuBatchCreateResult>> batchCreateProduct(
+            @RequestBody @Valid ProductSkuBatchCreateRequest request) {
+
+        // check attribute
+        List<ProductSkuCreateDTO> dtoList = new ArrayList<>(request.getComboCustomPropertyBags().size());
+        try {
+            for (Map<String, String> comboCustomPropertyBag : request.getComboCustomPropertyBags()) {
+                for (Map.Entry<String, String> entry : comboCustomPropertyBag.entrySet()) {
+                    String key = entry.getKey();
+                    String dataType = key.substring(key.indexOf("[") + 1, key.indexOf("]"));
+                    String attributeId = key.substring(key.indexOf("]") + 1);
+                    String value = entry.getValue();
+                    ProductAttributeCheckerFactory.getInstance().check(attributeId, dataType, value);
+                }
+
+                ProductSkuCreateDTO productSkuCreateDTO = new ProductSkuCreateDTO();
+                productSkuCreateDTO.setProductName(request.getProductName());
+                productSkuCreateDTO.setProductDescription(request.getProductDescription());
+                productSkuCreateDTO.setProductTypeId(request.getProductTypeId());
+                productSkuCreateDTO.setCustomPropertyBag(comboCustomPropertyBag);
+                dtoList.add(productSkuCreateDTO);
+            }
+        } catch (Exception e) {
+            return ResponseEntity.badRequest().body(HiChinaResult.error(e.getMessage()));
+        }
+
+        List<String> skuIds = new ArrayList<>();
+        for (ProductSkuCreateDTO dto : dtoList) {
+            String skuId = insertProductSkuInTransaction(dto);
+            skuIds.add(skuId);
+        }
+        return ResponseEntity.ok(HiChinaResult.ok(new ProductSkuBatchCreateResult(skuIds)));
+    }
+
     @PutMapping("/withpropertybags/{skuId}")
-    public HichinaResponse updateProductWithAllProperties(@PathVariable("skuId") String skuId ,@RequestBody ProductSkuUpdateDTO request){
+    public HichinaResponse updateProductWithAllProperties(@PathVariable("skuId") String skuId, @RequestBody ProductSkuUpdateDTO request) {
         HichinaResponse ret = new HichinaResponse();
         HichinaProduct toUpdate = productSkuService.updateProducts(skuId, request);
         productSkuService.postProcessSkuGroup(toUpdate);
         ret.setOk(true);
         ret.setData(skuId);
-        ret.setMessage("成功更新skuId:"+skuId+"的产品");
+        ret.setMessage("成功更新skuId:" + skuId + "的产品");
         return ret;
     }
 
     @PutMapping("/contentonly/{skuId}")
-    public HichinaResponse updateContentOnly(@PathVariable("skuId") String skuId ,@RequestBody ProductSkuContentUpdateRequest request){
+    public HichinaResponse updateContentOnly(@PathVariable("skuId") String skuId, @RequestBody ProductSkuContentUpdateRequest request) {
         HichinaResponse ret = new HichinaResponse();
         productSkuService.updateProductContentOnly(skuId, request.getContent());
         ret.setOk(true);
         ret.setData(skuId);
-        ret.setMessage("成功更新skuId:"+skuId+"的产品（仅主体内容）");
+        ret.setMessage("成功更新skuId:" + skuId + "的产品（仅主体内容）");
         return ret;
     }
 
     @DeleteMapping("/batch")
-    public HichinaResponse deleteProductSkus(@RequestBody ProductSkuBatchDeleteRequest req){
+    public HichinaResponse deleteProductSkus(@RequestBody ProductSkuBatchDeleteRequest req) {
         List<String> affectedSkuGroupIds = productSkuGroupMapper.findSkuGroupIdsBySkuIds(req.getToDelete());
         productSkuService.deleteProductSkus(req.getToDelete());
         productSkuService.postProcessSkuGroupV2(affectedSkuGroupIds);

hichina-admin-backend/src/main/java/com/hichina/admin/hichinaadminbackend/model/DTO/HiChinaResult.java

@@ -0,0 +1,45 @@
+package com.hichina.admin.hichinaadminbackend.model.DTO;
+
+import lombok.Data;
+
+@Data
+public class HiChinaResult<T> {
+
+    private boolean ok;
+
+    private String message;
+
+    private T data;
+
+    public static <T> HiChinaResult<T> ok(T data) {
+        HiChinaResult<T> result = new HiChinaResult<>();
+        result.ok = true;
+        result.message = "ok";
+        result.data = data;
+        return result;
+    }
+
+    public static <T> HiChinaResult<T> ok(String message, T data) {
+        HiChinaResult<T> result = new HiChinaResult<>();
+        result.ok = true;
+        result.message = message;
+        result.data = data;
+        return result;
+    }
+
+    public static <T> HiChinaResult<T> error(String message) {
+        HiChinaResult<T> result = new HiChinaResult<>();
+        result.ok = false;
+        result.message = message;
+        result.data = null;
+        return result;
+    }
+
+    public static <T> HiChinaResult<T> error(String message, T data) {
+        HiChinaResult<T> result = new HiChinaResult<>();
+        result.ok = false;
+        result.message = message;
+        result.data = data;
+        return result;
+    }
+}

hichina-admin-backend/src/main/java/com/hichina/admin/hichinaadminbackend/model/DTO/ProductSkuBatchCreateRequest.java

@@ -0,0 +1,26 @@
+package com.hichina.admin.hichinaadminbackend.model.DTO;
+
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class ProductSkuBatchCreateRequest {
+
+    @NotEmpty
+    private String productName;
+
+    @NotEmpty
+    private String productDescription;
+
+    @NotEmpty
+    private String productTypeId;
+
+    /**
+     * 套餐自定义属性
+     */
+    private List<Map<String, String>> comboCustomPropertyBags;
+
+}

hichina-admin-backend/src/main/java/com/hichina/admin/hichinaadminbackend/model/DTO/ProductSkuBatchCreateResult.java

@@ -0,0 +1,16 @@
+package com.hichina.admin.hichinaadminbackend.model.DTO;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProductSkuBatchCreateResult {
+
+    private List<String> skuIds;
+
+}

hichina-admin-backend/src/main/java/com/hichina/admin/hichinaadminbackend/model/ProductSkuIntAttributeMapping.java

@@ -18,4 +18,13 @@ public class ProductSkuIntAttributeMapping {
 
     @JsonProperty("attribute_value")
     private Integer attributeValue;
+
+    public static ProductSkuIntAttributeMapping create(String skuId, String attributeId, String value) {
+        ProductSkuIntAttributeMapping productSkuIntAttributeMapping = new ProductSkuIntAttributeMapping();
+        productSkuIntAttributeMapping.setSkuId(skuId);
+        productSkuIntAttributeMapping.setAttributeValue(Integer.parseInt(value));
+        productSkuIntAttributeMapping.setDataType("integer");
+        productSkuIntAttributeMapping.setAttributeId(attributeId);
+        return productSkuIntAttributeMapping;
+    }
 }

hichina-admin-backend/src/main/java/com/hichina/admin/hichinaadminbackend/model/ProductSkuTimestampAttributeMapping.java

@@ -4,7 +4,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
 @Data
 @NoArgsConstructor
@@ -20,4 +23,20 @@ public class ProductSkuTimestampAttributeMapping {
 
     @JsonProperty("attribute_value")
     private Date attributeValue;
+
+    public static ProductSkuTimestampAttributeMapping create(String skuId, String attributeId, String value) {
+        ProductSkuTimestampAttributeMapping productSkuTimestampAttributeMapping = new ProductSkuTimestampAttributeMapping();
+        productSkuTimestampAttributeMapping.setSkuId(skuId);
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd", Locale.ENGLISH);
+        Date date = null;
+        try {
+            date = formatter.parse(value);
+            productSkuTimestampAttributeMapping.setAttributeValue(date);
+            productSkuTimestampAttributeMapping.setDataType("date");
+            productSkuTimestampAttributeMapping.setAttributeId(attributeId);
+        } catch (ParseException e) {
+            throw new RuntimeException("Invalid date format");
+        }
+        return productSkuTimestampAttributeMapping;
+    }
 }

hichina-admin-backend/src/main/resources/logback.xml

@@ -12,7 +12,7 @@
             <!-- Name of the file where the log messages are written -->
 
             <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                <fileNamePattern>/Users/xiefengchang/logs/hichinaadmin/hichinaadmin-%d{yyyy-MM-dd}-dev.log</fileNamePattern>
+                <fileNamePattern>/opt/hichina/logs/hichinaadmin/hichinaadmin-%d{yyyy-MM-dd}-dev.log</fileNamePattern>
                 <maxHistory>30</maxHistory>
             </rollingPolicy>
             <encoder>
@@ -40,7 +40,7 @@
             <!-- Name of the file where the log messages are written -->
 
             <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                <fileNamePattern>/root/Downloads/logs/adminqa/hichinaadmin-%d{yyyy-MM-dd}-qa.log</fileNamePattern>
+                <fileNamePattern>/opt/hichina/logs/adminqa/hichinaadmin-%d{yyyy-MM-dd}-qa.log</fileNamePattern>
                 <maxHistory>30</maxHistory>
             </rollingPolicy>
             <encoder>
@@ -67,7 +67,7 @@
             <!-- Name of the file where the log messages are written -->
 
             <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                <fileNamePattern>/root/Downloads/logs/adminprod/hichinaadmin-%d{yyyy-MM-dd}-prod.log</fileNamePattern>
+                <fileNamePattern>/opt/hichina/logs/adminprod/hichinaadmin-%d{yyyy-MM-dd}-prod.log</fileNamePattern>
                 <maxHistory>30</maxHistory>
             </rollingPolicy>
             <encoder>

hichina-admin-backend/src/test/groovy/com/hichina/admin/hichinaadminbackend/controller/ProductSkuSpec.groovy

@@ -0,0 +1,193 @@
+package com.hichina.admin.hichinaadminbackend.controller
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.hichina.admin.hichinaadminbackend.HichinaAdminBackendApplication
+import com.hichina.admin.hichinaadminbackend.config.Constants
+import com.hichina.admin.hichinaadminbackend.mapper.*
+import com.hichina.admin.hichinaadminbackend.model.DTO.ProductSkuBatchCreateRequest
+import com.hichina.admin.hichinaadminbackend.model.ProductSkuGroup
+import org.mybatis.spring.boot.test.autoconfigure.AutoConfigureMybatis
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataMongo
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.security.test.context.support.WithMockUser
+import org.springframework.test.context.ActiveProfiles
+import org.springframework.test.web.servlet.MockMvc
+import spock.lang.Specification
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
+
+@SpringBootTest(classes= HichinaAdminBackendApplication)
+@ActiveProfiles("test")
+@AutoConfigureMockMvc
+@AutoConfigureMybatis
+@AutoConfigureDataMongo
+@WithMockUser(username = "admin", roles = ["ADMIN"])
+@WebMvcTest
+class ProductSkuSpec extends Specification {
+
+    @Autowired
+    MockMvc mvc
+
+    @Autowired
+    ProductSkuGroupMapper groupMapper
+
+    @Autowired
+    HichinaProductMapper productMapper
+
+    @Autowired
+    ProductSkuIntAttributeMappingMapper productSkuIntAttributeMappingMapper
+
+    @Autowired
+    ProductSkuVarcharAttributeMappingMapper productSkuVarcharAttributeMappingMapper
+
+    @Autowired
+    ProductSkuTimestampAttributeMappingMapper productSkuTimestampAttributeMappingMapper
+
+    def "should batch add product skus if sku group not exist"() {
+        given:
+        def request = new ProductSkuBatchCreateRequest(
+                productName: "test",
+                productDescription: "test",
+                productTypeId: Constants.TOURPRODUCTTYPE,
+                comboCustomPropertyBags: [
+                        [
+                                "[integer]8cc865ff-b30f-4f00-b426-9e64418e5100"   : "1",
+                                "[string]04a54b65-a1f3-45d9-955c-40cf88f21b82"    : "vendor",
+                                "[string]11cd8b32-c4f6-47db-8b8a-486c992bf43b"    : "test",
+                                "[integer]e228b843-e054-41f8-91dd-19663460df54"   : "1000",
+                                "[integer]c4c845a7-4bef-46d8-a5ad-d72a5464e8b1"   : "500",
+                                "[integer]448406cb-b68f-439e-9da8-148d78ae8404"   : "0",
+                                "[integer]d4825026-3ad8-4861-8e8f-e980b55fe67b"   : "200",
+                                "[string]f3cac6ed-8e87-4fb9-a912-bd87f483b4d5"    : "testdesc1",
+                                "[datestring]f0b807e5-d1a6-4454-a400-7905a4fea492": "2024/3/20;2024/3/21;",
+                        ],
+                        [
+                                "[integer]8cc865ff-b30f-4f00-b426-9e64418e5100"   : "1",
+                                "[string]04a54b65-a1f3-45d9-955c-40cf88f21b82"    : "vendor",
+                                "[string]11cd8b32-c4f6-47db-8b8a-486c992bf43b"    : "test2",
+                                "[integer]e228b843-e054-41f8-91dd-19663460df54"   : "1200",
+                                "[integer]c4c845a7-4bef-46d8-a5ad-d72a5464e8b1"   : "500",
+                                "[integer]448406cb-b68f-439e-9da8-148d78ae8404"   : "0",
+                                "[integer]d4825026-3ad8-4861-8e8f-e980b55fe67b"   : "200",
+                                "[string]f3cac6ed-8e87-4fb9-a912-bd87f483b4d5"    : "testdesc1",
+                                "[datestring]f0b807e5-d1a6-4454-a400-7905a4fea492": "2024/3/20;2024/3/21;",
+                        ]
+                ]
+        )
+
+        when:
+        mvc.perform {
+            post("/product/sku/batch")
+                    .contentType("application/json")
+                    .content((new ObjectMapper()).writeValueAsString(request))
+        }
+
+        then:
+        1 * groupMapper.insert(_)
+        2 * productMapper.insert(_)
+        10 * productSkuIntAttributeMappingMapper.insert(_)
+        8 * productSkuVarcharAttributeMappingMapper.insert(_)
+        1 * groupMapper.updateMinPriceAndImage(_)
+    }
+
+    def "should batch add product skus if sku group exist"() {
+        given:
+        groupMapper.findByNameAndProductTypeId("test", Constants.TOURPRODUCTTYPE) >> [
+                new ProductSkuGroup(skuGroupId: "1d4befa4-acf9-4de4-a596-2163cd45ea21", skuGroupName: "test")
+        ]
+        def request = new ProductSkuBatchCreateRequest(
+                productName: "test",
+                productDescription: "test",
+                productTypeId: Constants.TOURPRODUCTTYPE,
+                comboCustomPropertyBags: [
+                        [
+                                "[integer]8cc865ff-b30f-4f00-b426-9e64418e5100"   : "1",
+                                "[string]04a54b65-a1f3-45d9-955c-40cf88f21b82"    : "vendor",
+                                "[string]11cd8b32-c4f6-47db-8b8a-486c992bf43b"    : "test",
+                                "[integer]e228b843-e054-41f8-91dd-19663460df54"   : "1000",
+                                "[integer]c4c845a7-4bef-46d8-a5ad-d72a5464e8b1"   : "500",
+                                "[integer]448406cb-b68f-439e-9da8-148d78ae8404"   : "0",
+                                "[integer]d4825026-3ad8-4861-8e8f-e980b55fe67b"   : "200",
+                                "[string]f3cac6ed-8e87-4fb9-a912-bd87f483b4d5"    : "testdesc1",
+                                "[datestring]f0b807e5-d1a6-4454-a400-7905a4fea492": "2024/3/20;2024/3/21;",
+                        ],
+                        [
+                                "[integer]8cc865ff-b30f-4f00-b426-9e64418e5100"   : "1",
+                                "[string]04a54b65-a1f3-45d9-955c-40cf88f21b82"    : "vendor",
+                                "[string]11cd8b32-c4f6-47db-8b8a-486c992bf43b"    : "test2",
+                                "[integer]e228b843-e054-41f8-91dd-19663460df54"   : "1200",
+                                "[integer]c4c845a7-4bef-46d8-a5ad-d72a5464e8b1"   : "500",
+                                "[integer]448406cb-b68f-439e-9da8-148d78ae8404"   : "0",
+                                "[integer]d4825026-3ad8-4861-8e8f-e980b55fe67b"   : "200",
+                                "[string]f3cac6ed-8e87-4fb9-a912-bd87f483b4d5"    : "testdesc1",
+                                "[datestring]f0b807e5-d1a6-4454-a400-7905a4fea492": "2024/3/20;2024/3/21;",
+                        ]
+                ]
+        )
+
+        when:
+        mvc.perform {
+            post("/product/sku/batch")
+                    .contentType("application/json")
+                    .content((new ObjectMapper()).writeValueAsString(request))
+        }
+
+        then:
+        0 * groupMapper.insert(_)
+        2 * productMapper.insert(_)
+        10 * productSkuIntAttributeMappingMapper.insert(_)
+        8 * productSkuVarcharAttributeMappingMapper.insert(_)
+        1 * groupMapper.updateMinPriceAndImage(_)
+    }
+
+    def "should not batch add product skus if any sku is invalid"() {
+        given:
+        def request = new ProductSkuBatchCreateRequest(
+                productName: "",
+                productDescription: "test",
+                productTypeId: Constants.TOURPRODUCTTYPE,
+                comboCustomPropertyBags: [
+                        [
+                                "[integer]8cc865ff-b30f-4f00-b426-9e64418e5100"   : "1",
+                                "[string]04a54b65-a1f3-45d9-955c-40cf88f21b82"    : "vendor",
+                                "[string]11cd8b32-c4f6-47db-8b8a-486c992bf43b"    : "test",
+                                "[integer]e228b843-e054-41f8-91dd-19663460df54"   : "1000",
+                                "[integer]c4c845a7-4bef-46d8-a5ad-d72a5464e8b1"   : "500",
+                                "[integer]448406cb-b68f-439e-9da8-148d78ae8404"   : "0",
+                                "[integer]d4825026-3ad8-4861-8e8f-e980b55fe67b"   : "200",
+                                "[string]f3cac6ed-8e87-4fb9-a912-bd87f483b4d5"    : "testdesc1",
+                                "[datestring]f0b807e5-d1a6-4454-a400-7905a4fea492": "2024/3/20;2024/3/21;",
+                        ],
+                        [
+                                "[integer]8cc865ff-b30f-4f00-b426-9e64418e5100"   : "1",
+                                "[string]04a54b65-a1f3-45d9-955c-40cf88f21b82"    : "vendor",
+                                "[string]11cd8b32-c4f6-47db-8b8a-486c992bf43b"    : "test2",
+                                "[integer]e228b843-e054-41f8-91dd-19663460df54"   : "1200",
+                                "[integer]c4c845a7-4bef-46d8-a5ad-d72a5464e8b1"   : "500",
+                                "[integer]448406cb-b68f-439e-9da8-148d78ae8404"   : "0",
+                                "[integer]d4825026-3ad8-4861-8e8f-e980b55fe67b"   : "200",
+                                "[string]f3cac6ed-8e87-4fb9-a912-bd87f483b4d5"    : "testdesc1",
+                                "[datestring]f0b807e5-d1a6-4454-a400-7905a4fea492": "2024/3/20;2024/3/21;",
+                        ]
+                ]
+        )
+
+        when:
+        def result = mvc.perform {
+            post("/api/v1/productsku/batch")
+                    .contentType("application/json")
+                    .content((new ObjectMapper()).writeValueAsString(request))
+        }
+
+        then:
+        result.andExpect {
+            status().isBadRequest()
+        }
+        1 == 1
+
+    }
+}

hichina-admin-backend/src/test/java/com/hichina/admin/hichinaadminbackend/HichinaAdminBackendApplicationTests.java

@@ -2,8 +2,10 @@ package com.hichina.admin.hichinaadminbackend;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
+@ActiveProfiles("test")
 class HichinaAdminBackendApplicationTests {
 
 	@Test

hichina-admin-backend/src/test/java/com/hichina/admin/hichinaadminbackend/controller/ProductSkuTestCase.java

@@ -0,0 +1,210 @@
+package com.hichina.admin.hichinaadminbackend.controller;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.hichina.admin.hichinaadminbackend.config.Constants;
+import com.hichina.admin.hichinaadminbackend.mapper.*;
+import com.hichina.admin.hichinaadminbackend.model.DTO.HiChinaResult;
+import com.hichina.admin.hichinaadminbackend.model.DTO.ProductSkuBatchCreateRequest;
+import com.hichina.admin.hichinaadminbackend.model.DTO.ProductSkuBatchCreateResult;
+import com.hichina.admin.hichinaadminbackend.model.ProductSkuGroup;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.mybatis.spring.boot.test.autoconfigure.AutoConfigureMybatis;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataMongo;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@SpringBootTest
+@ActiveProfiles("test")
+@AutoConfigureMockMvc
+@AutoConfigureMybatis
+@AutoConfigureDataMongo
+@WithMockUser(username = "admin", roles = {"ADMIN"})
+class ProductSkuTestCase {
+
+    @Autowired
+    MockMvc mvc;
+
+    @Autowired
+    ProductSkuGroupMapper groupMapper;
+
+    @Autowired
+    HichinaProductMapper productMapper;
+
+    @Autowired
+    ProductSkuIntAttributeMappingMapper productSkuIntAttributeMappingMapper;
+
+    @Autowired
+    ProductSkuVarcharAttributeMappingMapper productSkuVarcharAttributeMappingMapper;
+
+    @Autowired
+    ProductSkuTimestampAttributeMappingMapper productSkuTimestampAttributeMappingMapper;
+
+    @Test
+    @Transactional
+    void should_batch_add_product_skus_if_sku_group_not_exist() throws Exception {
+        //given:
+        var request = new ProductSkuBatchCreateRequest();
+        request.setProductName("test");
+        request.setProductDescription("test");
+        request.setProductTypeId(Constants.TOURPRODUCTTYPE);
+        request.setComboCustomPropertyBags(
+                List.of(
+                        Map.of(
+                                "[integer]8cc865ff-b30f-4f00-b426-9e64418e5100", "1",
+                                "[string]04a54b65-a1f3-45d9-955c-40cf88f21b82", "vendor",
+                                "[string]11cd8b32-c4f6-47db-8b8a-486c992bf43b", "test",
+                                "[integer]e228b843-e054-41f8-91dd-19663460df54", "1000",
+                                "[integer]c4c845a7-4bef-46d8-a5ad-d72a5464e8b1", "500",
+                                "[integer]448406cb-b68f-439e-9da8-148d78ae8404", "0",
+                                "[integer]d4825026-3ad8-4861-8e8f-e980b55fe67b", "200",
+                                "[string]f3cac6ed-8e87-4fb9-a912-bd87f483b4d5", "testdesc1",
+                                "[datestring]f0b807e5-d1a6-4454-a400-7905a4fea492", "2024/3/20;2024/3/21;"
+                        ),
+                        Map.of(
+                                "[integer]8cc865ff-b30f-4f00-b426-9e64418e5100", "1",
+                                "[string]04a54b65-a1f3-45d9-955c-40cf88f21b82", "vendor",
+                                "[string]11cd8b32-c4f6-47db-8b8a-486c992bf43b", "test2",
+                                "[integer]e228b843-e054-41f8-91dd-19663460df54", "1200",
+                                "[integer]c4c845a7-4bef-46d8-a5ad-d72a5464e8b1", "500",
+                                "[integer]448406cb-b68f-439e-9da8-148d78ae8404", "0",
+                                "[integer]d4825026-3ad8-4861-8e8f-e980b55fe67b", "200",
+                                "[string]f3cac6ed-8e87-4fb9-a912-bd87f483b4d5", "testdesc1",
+                                "[datestring]f0b807e5-d1a6-4454-a400-7905a4fea492", "2024/3/20;2024/3/21;"
+                        )
+                )
+        );
+
+        // when:
+        var result = mvc.perform(
+                post("/api/v1/productsku/batch")
+                        .contentType("application/json")
+                        .content((new ObjectMapper()).writeValueAsString(request)));
+
+        // then:
+        var content = result.andExpect(status().isOk())
+                .andExpect(jsonPath("$.ok").value(true))
+                .andReturn().getResponse().getContentAsString();
+        HiChinaResult<ProductSkuBatchCreateResult> r = (new ObjectMapper()).readValue(content, new TypeReference<>() {
+        });
+        ProductSkuBatchCreateResult data = r.getData();
+        Assertions.assertEquals(2, data.getSkuIds().size());
+
+        // check group exist
+        var groups = groupMapper.findByNameAndProductTypeId("test", Constants.TOURPRODUCTTYPE);
+        Assertions.assertEquals(1, groups.size());
+        Assertions.assertEquals(1000, groups.get(0).getMinPrice());
+
+        // check sku exist
+        for (var skuId : data.getSkuIds()) {
+            var sku = productMapper.findBySkuId(skuId);
+            Assertions.assertNotNull(sku);
+        }
+
+    }
+
+    @Test
+    @Transactional
+    void should_batch_add_product_skus_if_sku_group_exist() throws Exception {
+        //given:
+        var g = new ProductSkuGroup("xxxx", "test", Constants.TOURPRODUCTTYPE, new Date(), true, "test", 2000);
+        groupMapper.insert(g);
+
+        var request = new ProductSkuBatchCreateRequest();
+        request.setProductName("test");
+        request.setProductDescription("test");
+        request.setProductTypeId(Constants.TOURPRODUCTTYPE);
+        request.setComboCustomPropertyBags(
+                List.of(
+                        Map.of(
+                                "[integer]8cc865ff-b30f-4f00-b426-9e64418e5100", "1",
+                                "[string]04a54b65-a1f3-45d9-955c-40cf88f21b82", "vendor",
+                                "[string]11cd8b32-c4f6-47db-8b8a-486c992bf43b", "test",
+                                "[integer]e228b843-e054-41f8-91dd-19663460df54", "1000",
+                                "[integer]c4c845a7-4bef-46d8-a5ad-d72a5464e8b1", "500",
+                                "[integer]448406cb-b68f-439e-9da8-148d78ae8404", "0",
+                                "[integer]d4825026-3ad8-4861-8e8f-e980b55fe67b", "200",
+                                "[string]f3cac6ed-8e87-4fb9-a912-bd87f483b4d5", "testdesc1",
+                                "[datestring]f0b807e5-d1a6-4454-a400-7905a4fea492", "2024/3/20;2024/3/21;"
+                        ),
+                        Map.of(
+                                "[integer]8cc865ff-b30f-4f00-b426-9e64418e5100", "1",
+                                "[string]04a54b65-a1f3-45d9-955c-40cf88f21b82", "vendor",
+                                "[string]11cd8b32-c4f6-47db-8b8a-486c992bf43b", "test2",
+                                "[integer]e228b843-e054-41f8-91dd-19663460df54", "1200",
+                                "[integer]c4c845a7-4bef-46d8-a5ad-d72a5464e8b1", "500",
+                                "[integer]448406cb-b68f-439e-9da8-148d78ae8404", "0",
+                                "[integer]d4825026-3ad8-4861-8e8f-e980b55fe67b", "200",
+                                "[string]f3cac6ed-8e87-4fb9-a912-bd87f483b4d5", "testdesc1",
+                                "[datestring]f0b807e5-d1a6-4454-a400-7905a4fea492", "2024/3/20;2024/3/21;"
+                        )
+                )
+        );
+
+        // when:
+        var result = mvc.perform(
+                post("/api/v1/productsku/batch")
+                        .contentType("application/json")
+                        .content((new ObjectMapper()).writeValueAsString(request)));
+
+        // then:
+        var content = result.andExpect(status().isOk())
+                .andExpect(jsonPath("$.ok").value(true))
+                .andReturn().getResponse().getContentAsString();
+        HiChinaResult<ProductSkuBatchCreateResult> r = (new ObjectMapper()).readValue(content, new TypeReference<>() {
+        });
+        ProductSkuBatchCreateResult data = r.getData();
+        Assertions.assertEquals(2, data.getSkuIds().size());
+
+        // check group exist
+        var groups = groupMapper.findByNameAndProductTypeId("test", Constants.TOURPRODUCTTYPE);
+        Assertions.assertEquals(1, groups.size());
+        Assertions.assertEquals(1000, groups.get(0).getMinPrice());
+
+        // check sku exist
+        for (var skuId : data.getSkuIds()) {
+            var sku = productMapper.findBySkuId(skuId);
+            Assertions.assertNotNull(sku);
+        }
+
+    }
+
+    @Test
+    @Transactional
+    void should_not_insert_any_product_skus_if_error() throws Exception {
+
+    }
+
+    @Test
+    void should_not_batch_add_product_skus_if_any_sku_is_invalid() throws Exception {
+        //given:
+        var request = new ProductSkuBatchCreateRequest();
+        request.setProductName("");
+        request.setProductDescription("test");
+        request.setProductTypeId(Constants.TOURPRODUCTTYPE);
+
+        //when:
+        var result = mvc.perform(
+                post("/api/v1/productsku/batch")
+                        .contentType("application/json")
+                        .content((new ObjectMapper()).writeValueAsString(request)));
+
+        //then:
+        result.andExpect(status().isBadRequest());
+
+    }
+}

hichina-admin-backend/src/test/resources/application-test.yaml

@@ -0,0 +1,73 @@
+server:
+  port: 9050
+
+spring:
+  datasource:
+    #url: jdbc:mysql://localhost:3306/unified_hichina?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&&allowMultiQueries=true
+    url: jdbc:h2:mem:db;DB_CLOSE_DELAY=-1;MODE=Mysql
+    username: root
+    password: Passw0rd
+    #driver-class-name: com.mysql.cj.jdbc.Driver
+    driver-class-name: org.h2.Driver
+  data:
+    mongodb:
+      uri: mongodb://localhost:27017/unified_hichina
+      database: unified_hichina
+  liquibase:
+    # change-log file db/changelog/liquibase-changeLog.xml has problems,
+    # so if db change, we need generate changelog from db for refresh version
+    change-log: classpath:liquibase-changeLog.xml
+    enabled: true
+    drop-first: false
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: Asia/Shanghai
+
+de:
+  flapdoodle:
+    mongodb:
+      embedded:
+        version: 4.0.2
+
+
+mybatis:
+  configuration:
+    map-underscore-to-camel-case: true
+
+aliyun:
+  blog:
+    bucket: newblogimages
+  user:
+    profile:
+      bucket: family-user-profile
+  oss:
+    endpoint: http://oss-cn-nanjing.aliyuncs.com
+#      domain: oss-cn-nanjing.aliyuncs.com
+
+hichina:
+  root:
+    access:
+      key:
+        secret: OtmgF0YE74gVSa2TFcQsoWa6RujSgb
+        id: LTAI5tHiFqvcRHbZYcKZ7Ksm
+base:
+  serving:
+    url: http://localhost:9050
+chatgpt:
+  model: text-davinci-003
+default:
+  page:
+    size: 100
+logging:
+  level:
+    org:
+      hibernate: ERROR
+      springframework:
+        web: DEBUG
+mainsite:
+  base: http://localhost:9053
+openai:
+  token: '**,20,1082'
+origin:
+  base: http://localhost:9051
+

hichina-admin-backend/src/test/resources/liquibase-changeLog.xml

@@ -0,0 +1,420 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+    <changeSet author="dsm (generated)" id="1710759291530-1">
+        <createTable tableName="admin_user">
+            <column name="username" type="VARCHAR(100)">
+                <constraints nullable="false" unique="true"/>
+            </column>
+            <column name="password" type="VARCHAR(100)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="created_time" type="timestamp"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-2">
+        <createTable tableName="blog">
+            <column name="blog_id" type="VARCHAR(50)">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="user_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="created_time" type="timestamp"/>
+            <column name="last_update_time" type="timestamp"/>
+            <column name="title" type="VARCHAR(200)"/>
+            <column name="head_image_url" type="VARCHAR(500)"/>
+            <column name="language" type="VARCHAR(50)"/>
+            <column name="content" type="LONGTEXT"/>
+            <column defaultValue="0" name="draft" type="BIT(1)"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-3">
+        <createTable tableName="comment">
+            <column name="comment_id" type="VARCHAR(50)">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="user_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="blog_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="created_time" type="timestamp"/>
+            <column name="respond_to" type="VARCHAR(50)"/>
+            <column name="comment_content" type="TEXT"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-4">
+        <createTable tableName="destination">
+            <column name="destination_id" type="VARCHAR(50)">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="destination_name" type="VARCHAR(500)"/>
+            <column name="level" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="parent_id" type="VARCHAR(50)"/>
+            <column name="description" type="TEXT"/>
+            <column name="created_date" type="timestamp"/>
+            <column name="destination_profile_image" type="VARCHAR(500)"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-5">
+        <createTable tableName="guidebook">
+            <column name="guide_id" type="VARCHAR(50)">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="download_url" type="VARCHAR(500)"/>
+            <column name="cover_image_url" type="VARCHAR(500)"/>
+            <column name="short_description" type="VARCHAR(300)"/>
+            <column name="destination_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="created_date" type="timestamp"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-6">
+        <createTable tableName="hichina_line">
+            <column autoIncrement="true" name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="public_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="name" type="VARCHAR(300)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="created_date" type="timestamp"/>
+            <column name="icon_path" type="VARCHAR(300)"/>
+            <column name="range_in_days" type="INT"/>
+            <column name="base_price" type="FLOAT(12)"/>
+            <column name="description" type="TEXT"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-7">
+        <createTable tableName="hichina_product">
+            <column name="sku_id" type="VARCHAR(50)">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="sku_group_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="product_type_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="product_name" type="VARCHAR(500)"/>
+            <column name="product_content" type="TEXT"/>
+            <column name="created_time" type="timestamp"/>
+            <column name="created_by" type="VARCHAR(100)"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-8">
+        <createTable tableName="hichina_product_type">
+            <column name="product_type_id" type="VARCHAR(50)">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="product_type_name" type="VARCHAR(50)">
+                <constraints nullable="false" unique="true"/>
+            </column>
+            <column name="product_type_description" type="VARCHAR(100)"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-9">
+        <createTable tableName="order">
+            <column name="order_id" type="VARCHAR(50)">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="user_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="product_sku_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column defaultValueComputed="CURRENT_TIMESTAMP" name="created_time" type="timestamp">
+                <constraints nullable="false"/>
+            </column>
+            <column name="last_update_time" type="timestamp"/>
+            <column name="meta" type="TEXT"/>
+            <column name="status" type="VARCHAR(50)"/>
+            <column name="paying_info" type="VARCHAR(500)"/>
+            <column name="price" type="INT"/>
+            <column name="remark" type="VARCHAR(500)"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-10">
+        <createTable tableName="product_attribute">
+            <column name="attribute_id" type="VARCHAR(50)">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="attribute_name" type="VARCHAR(50)">
+                <constraints nullable="false" unique="true"/>
+            </column>
+            <column name="data_type" type="VARCHAR(20)">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-11">
+        <createTable tableName="product_sku_group">
+            <column name="sku_group_id" type="VARCHAR(50)">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="sku_group_name" type="VARCHAR(500)"/>
+            <column name="product_type_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="created_date" type="timestamp"/>
+            <column defaultValue="0" name="enabled" type="BIT(1)"/>
+            <column name="image_url" type="VARCHAR(500)"/>
+            <column name="min_price" type="INT"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-12">
+        <createTable tableName="product_sku_group_destination_mapping">
+            <column name="product_sku_group_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="destination_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-13">
+        <createTable tableName="product_sku_int_attribute_mapping">
+            <column name="sku_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="data_type" type="VARCHAR(20)"/>
+            <column name="attribute_value" type="INT"/>
+            <column name="attribute_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-14">
+        <createTable tableName="product_sku_timestamp_attribute_mapping">
+            <column name="sku_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="data_type" type="VARCHAR(20)"/>
+            <column name="attribute_value" type="timestamp"/>
+            <column name="attribute_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-15">
+        <createTable tableName="product_sku_varchar_attribute_mapping">
+            <column name="sku_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="data_type" type="VARCHAR(20)"/>
+            <column name="attribute_value" type="TEXT"/>
+            <column name="attribute_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-16">
+        <createTable tableName="product_type_attribute_mapping">
+            <column name="product_type_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="attribute_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="sequence" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-17">
+        <createTable tableName="user">
+            <column name="user_id" type="VARCHAR(50)">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="salt" type="VARCHAR(100)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="password" type="VARCHAR(500)">
+                <constraints nullable="false"/>
+            </column>
+            <column defaultValueComputed="CURRENT_TIMESTAMP" name="created_time" type="timestamp">
+                <constraints nullable="false"/>
+            </column>
+            <column name="email" type="VARCHAR(100)">
+                <constraints unique="true"/>
+            </column>
+            <column name="facebook_id" type="VARCHAR(100)">
+                <constraints unique="true"/>
+            </column>
+            <column name="google_id" type="VARCHAR(100)">
+                <constraints unique="true"/>
+            </column>
+            <column name="wx_id" type="VARCHAR(100)">
+                <constraints unique="true"/>
+            </column>
+            <column name="phone" type="VARCHAR(100)">
+                <constraints unique="true"/>
+            </column>
+            <column name="username" type="VARCHAR(100)"/>
+            <column name="gender" type="INT"/>
+            <column name="birth_date" type="timestamp"/>
+            <column name="nationality" type="VARCHAR(100)"/>
+            <column name="license_type" type="VARCHAR(50)"/>
+            <column name="license_number" type="VARCHAR(100)"/>
+            <column name="license_sign_date" type="timestamp"/>
+            <column name="license_expire_date" type="timestamp"/>
+            <column name="signature" type="VARCHAR(200)"/>
+            <column name="profile_image_url" type="VARCHAR(500)"/>
+            <column name="passport_image_url" type="VARCHAR(500)"/>
+            <column name="pwd_code" type="INT"/>
+            <column name="login_type" type="VARCHAR(100)"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-18">
+        <addUniqueConstraint columnNames="guide_id, destination_id" constraintName="guidebookanddestinationoneonemapping" tableName="guidebook"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-19">
+        <addUniqueConstraint columnNames="product_type_id, attribute_id" constraintName="product_type_attribute_binding_unique" tableName="product_type_attribute_mapping"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-20">
+        <addUniqueConstraint columnNames="sku_id, attribute_id" constraintName="sku_id_single_attribute_int_value" tableName="product_sku_int_attribute_mapping"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-21">
+        <addUniqueConstraint columnNames="sku_id, attribute_id" constraintName="sku_id_single_attribute_timestamp_value" tableName="product_sku_timestamp_attribute_mapping"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-22">
+        <addUniqueConstraint columnNames="sku_id, attribute_id" constraintName="sku_id_single_attribute_varchar_value" tableName="product_sku_varchar_attribute_mapping"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-23">
+        <addUniqueConstraint columnNames="sku_group_name, product_type_id" constraintName="unique_sku_group_name_within_same_product_type" tableName="product_sku_group"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-24">
+        <addUniqueConstraint columnNames="product_sku_group_id, destination_id" constraintName="uniquebindingofskugroupidanddestinationid" tableName="product_sku_group_destination_mapping"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-25">
+        <createIndex associatedWith="" indexName="fk_blog_to_user_id" tableName="blog">
+            <column name="user_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-26">
+        <createIndex associatedWith="" indexName="fk_comment_to_blog_id" tableName="comment">
+            <column name="blog_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-27">
+        <createIndex associatedWith="" indexName="fk_comment_to_comment_id" tableName="comment">
+            <column name="respond_to"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-28">
+        <createIndex associatedWith="" indexName="fk_comment_to_user_id" tableName="comment">
+            <column name="user_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-29">
+        <createIndex associatedWith="" indexName="fk_destination_to_destination_id" tableName="destination">
+            <column name="parent_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-30">
+        <createIndex associatedWith="" indexName="fk_guidebook_to_destination_id" tableName="guidebook">
+            <column name="destination_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-31">
+        <createIndex associatedWith="" indexName="fk_order_to_product_sku_id" tableName="order">
+            <column name="product_sku_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-32">
+        <createIndex associatedWith="" indexName="fk_order_to_user_id" tableName="order">
+            <column name="user_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-33">
+        <createIndex associatedWith="" indexName="fk_prd_att_mapping_to_attr_id" tableName="product_type_attribute_mapping">
+            <column name="attribute_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-34">
+        <createIndex associatedWith="" indexName="fk_prd_att_mapping_to_product_type_id" tableName="product_type_attribute_mapping">
+            <column name="product_type_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-35">
+        <createIndex associatedWith="" indexName="fk_product_to_sku_group_group_id" tableName="hichina_product">
+            <column name="sku_group_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-36">
+        <createIndex associatedWith="" indexName="fk_product_to_type_type_id" tableName="hichina_product">
+            <column name="product_type_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-37">
+        <createIndex associatedWith="" indexName="fk_sku_group_to_product_type_id" tableName="product_sku_group">
+            <column name="product_type_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-38">
+        <createIndex associatedWith="" indexName="index_publicid" tableName="hichina_line">
+            <column name="public_id"/>
+            <column name="name"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-39">
+        <createIndex associatedWith="" indexName="indexblogcreatetime" tableName="blog">
+            <column name="created_time"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-40">
+        <addForeignKeyConstraint baseColumnNames="user_id" baseTableName="blog" constraintName="fk_blog_to_user_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="user_id" referencedTableName="user" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-41">
+        <addForeignKeyConstraint baseColumnNames="blog_id" baseTableName="comment" constraintName="fk_comment_to_blog_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="blog_id" referencedTableName="blog" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-42">
+        <addForeignKeyConstraint baseColumnNames="respond_to" baseTableName="comment" constraintName="fk_comment_to_comment_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="comment_id" referencedTableName="comment" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-43">
+        <addForeignKeyConstraint baseColumnNames="user_id" baseTableName="comment" constraintName="fk_comment_to_user_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="user_id" referencedTableName="user" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-44">
+        <addForeignKeyConstraint baseColumnNames="parent_id" baseTableName="destination" constraintName="fk_destination_to_destination_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="destination_id" referencedTableName="destination" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-45">
+        <addForeignKeyConstraint baseColumnNames="destination_id" baseTableName="guidebook" constraintName="fk_guidebook_to_destination_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="destination_id" referencedTableName="destination" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-46">
+        <addForeignKeyConstraint baseColumnNames="product_sku_id" baseTableName="order" constraintName="fk_order_to_product_sku_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="sku_id" referencedTableName="hichina_product" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-47">
+        <addForeignKeyConstraint baseColumnNames="user_id" baseTableName="order" constraintName="fk_order_to_user_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="user_id" referencedTableName="user" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-48">
+        <addForeignKeyConstraint baseColumnNames="attribute_id" baseTableName="product_type_attribute_mapping" constraintName="fk_prd_att_mapping_to_attr_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="attribute_id" referencedTableName="product_attribute" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-49">
+        <addForeignKeyConstraint baseColumnNames="product_type_id" baseTableName="product_type_attribute_mapping" constraintName="fk_prd_att_mapping_to_product_type_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="product_type_id" referencedTableName="hichina_product_type" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-50">
+        <addForeignKeyConstraint baseColumnNames="sku_group_id" baseTableName="hichina_product" constraintName="fk_product_to_sku_group_group_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="sku_group_id" referencedTableName="product_sku_group" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-51">
+        <addForeignKeyConstraint baseColumnNames="product_type_id" baseTableName="hichina_product" constraintName="fk_product_to_type_type_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="product_type_id" referencedTableName="hichina_product_type" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-52">
+        <addForeignKeyConstraint baseColumnNames="product_type_id" baseTableName="product_sku_group" constraintName="fk_sku_group_to_product_type_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="product_type_id" referencedTableName="hichina_product_type" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-53">
+        <addForeignKeyConstraint baseColumnNames="sku_id" baseTableName="product_sku_int_attribute_mapping" constraintName="fk_skuintattrmapping_to_product_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="sku_id" referencedTableName="hichina_product" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-54">
+        <addForeignKeyConstraint baseColumnNames="sku_id" baseTableName="product_sku_timestamp_attribute_mapping" constraintName="fk_skutimestampattrmapping_to_product_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="sku_id" referencedTableName="hichina_product" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-55">
+        <addForeignKeyConstraint baseColumnNames="sku_id" baseTableName="product_sku_varchar_attribute_mapping" constraintName="fk_skuvarcharattrmapping_to_product_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="sku_id" referencedTableName="hichina_product" validate="true"/>
+    </changeSet>
+</databaseChangeLog>

hichina-admin-front/.vscode/settings.json

@@ -11,5 +11,6 @@
     "javascriptreact",
     "typescript",
     "vue"
-  ]
+  ],
+  "editor.tabSize": 2
 }

hichina-admin-front/package-lock.json

@@ -13,7 +13,9 @@
         "@vueup/vue-quill": "^1.1.1",
         "axios": "^1.2.6",
         "core-js": "^3.6.5",
+        "element-plus": "^2.6.1",
         "js-base64": "^3.7.5",
+        "moment": "^2.30.1",
         "quasar": "^2.6.0",
         "quill-image-uploader": "^1.2.4",
         "v-upload-image": "^1.0.0",
@@ -1782,6 +1784,22 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@ctrl/tinycolor": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz",
+      "integrity": "sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@element-plus/icons-vue": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz",
+      "integrity": "sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==",
+      "peerDependencies": {
+        "vue": "^3.2.0"
+      }
+    },
     "node_modules/@eslint/eslintrc": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz",
@@ -1832,6 +1850,28 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@floating-ui/core": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.0.tgz",
+      "integrity": "sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==",
+      "dependencies": {
+        "@floating-ui/utils": "^0.2.1"
+      }
+    },
+    "node_modules/@floating-ui/dom": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.3.tgz",
+      "integrity": "sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==",
+      "dependencies": {
+        "@floating-ui/core": "^1.0.0",
+        "@floating-ui/utils": "^0.2.0"
+      }
+    },
+    "node_modules/@floating-ui/utils": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz",
+      "integrity": "sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q=="
+    },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.11.8",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
@@ -2091,6 +2131,16 @@
       "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==",
       "dev": true
     },
+    "node_modules/@popperjs/core": {
+      "name": "@sxzz/popperjs-es",
+      "version": "2.11.7",
+      "resolved": "https://registry.npmjs.org/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
+      "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
     "node_modules/@positron/stack-trace": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@positron/stack-trace/-/stack-trace-1.0.0.tgz",
@@ -2577,6 +2627,19 @@
       "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
       "dev": true
     },
+    "node_modules/@types/lodash": {
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.0.tgz",
+      "integrity": "sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA=="
+    },
+    "node_modules/@types/lodash-es": {
+      "version": "4.17.12",
+      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz",
+      "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
+      "dependencies": {
+        "@types/lodash": "*"
+      }
+    },
     "node_modules/@types/mime": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz",
@@ -2641,6 +2704,11 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/web-bluetooth": {
+      "version": "0.0.16",
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz",
+      "integrity": "sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ=="
+    },
     "node_modules/@types/webpack-bundle-analyzer": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/@types/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.6.0.tgz",
@@ -2810,6 +2878,89 @@
         "vue": "^3.2.41"
       }
     },
+    "node_modules/@vueuse/core": {
+      "version": "9.13.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-9.13.0.tgz",
+      "integrity": "sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==",
+      "dependencies": {
+        "@types/web-bluetooth": "^0.0.16",
+        "@vueuse/metadata": "9.13.0",
+        "@vueuse/shared": "9.13.0",
+        "vue-demi": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/core/node_modules/vue-demi": {
+      "version": "0.14.7",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz",
+      "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==",
+      "hasInstallScript": true,
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vueuse/metadata": {
+      "version": "9.13.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-9.13.0.tgz",
+      "integrity": "sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/shared": {
+      "version": "9.13.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-9.13.0.tgz",
+      "integrity": "sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==",
+      "dependencies": {
+        "vue-demi": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/shared/node_modules/vue-demi": {
+      "version": "0.14.7",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz",
+      "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==",
+      "hasInstallScript": true,
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
@@ -3241,6 +3392,11 @@
       "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
       "dev": true
     },
+    "node_modules/async-validator": {
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-4.2.5.tgz",
+      "integrity": "sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg=="
+    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -4466,6 +4622,11 @@
         "date-fns": ">=2.0.0"
       }
     },
+    "node_modules/dayjs": {
+      "version": "1.11.10",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
+      "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
+    },
     "node_modules/debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -4778,6 +4939,31 @@
       "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==",
       "dev": true
     },
+    "node_modules/element-plus": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.6.1.tgz",
+      "integrity": "sha512-6VRpLjwtIVdtUuITJPPKtpOH1NM6nuAkRE3q5O4Lrx0N1bYMhTkiqb2Jy7zfQuDPbOIkkF2OABTzegpNnzgsnQ==",
+      "dependencies": {
+        "@ctrl/tinycolor": "^3.4.1",
+        "@element-plus/icons-vue": "^2.3.1",
+        "@floating-ui/dom": "^1.0.1",
+        "@popperjs/core": "npm:@sxzz/popperjs-es@^2.11.7",
+        "@types/lodash": "^4.14.182",
+        "@types/lodash-es": "^4.17.6",
+        "@vueuse/core": "^9.1.0",
+        "async-validator": "^4.2.5",
+        "dayjs": "^1.11.3",
+        "escape-html": "^1.0.3",
+        "lodash": "^4.17.21",
+        "lodash-es": "^4.17.21",
+        "lodash-unified": "^1.0.2",
+        "memoize-one": "^6.0.0",
+        "normalize-wheel-es": "^1.2.0"
+      },
+      "peerDependencies": {
+        "vue": "^3.2.0"
+      }
+    },
     "node_modules/elementtree": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",
@@ -4881,8 +5067,7 @@
     "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
-      "dev": true
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "node_modules/escape-string-regexp": {
       "version": "1.0.5",
@@ -7407,8 +7592,22 @@
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
+    "node_modules/lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+    },
+    "node_modules/lodash-unified": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/lodash-unified/-/lodash-unified-1.0.3.tgz",
+      "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==",
+      "peerDependencies": {
+        "@types/lodash-es": "*",
+        "lodash": "*",
+        "lodash-es": "*"
+      }
     },
     "node_modules/lodash.clonedeep": {
       "version": "4.5.0",
@@ -7649,6 +7848,11 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/memoize-one": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",
+      "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="
+    },
     "node_modules/merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -7778,6 +7982,14 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/mrmime": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
@@ -7917,6 +8129,11 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/normalize-wheel-es": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/normalize-wheel-es/-/normalize-wheel-es-1.2.0.tgz",
+      "integrity": "sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw=="
+    },
     "node_modules/npm-run-path": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",

hichina-admin-front/package.json

@@ -14,9 +14,14 @@
     "@quasar/extras": "^1.0.0",
     "@vuepic/vue-datepicker": "^5.0.1",
     "@vueup/vue-quill": "^1.1.1",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
+    "ali-oss": "^6.20.0",
     "axios": "^1.2.6",
     "core-js": "^3.6.5",
+    "element-plus": "^2.6.1",
     "js-base64": "^3.7.5",
+    "moment": "^2.30.1",
     "quasar": "^2.6.0",
     "quill-image-uploader": "^1.2.4",
     "v-upload-image": "^1.0.0",

hichina-admin-front/quasar.config.js

@@ -23,7 +23,7 @@ module.exports = configure(function (ctx) {
     // app boot file (/src/boot)
     // --> boot files are part of "main.js"
     // https://v2.quasar.dev/quasar-cli-webpack/boot-files
-    boot: [],
+    boot: ['element-plus'],
 
     // https://v2.quasar.dev/quasar-cli-webpack/quasar-config-js#Property%3A-css
     css: ["app.scss"],

hichina-admin-front/src/boot/element-plus.js

@@ -0,0 +1,9 @@
+import { boot } from 'quasar/wrappers'
+import ElementPlus from 'element-plus'
+import 'element-plus/dist/index.css'
+
+export default boot(({ app }) => {
+    app.use(ElementPlus)
+});
+
+export { ElementPlus }

hichina-admin-front/src/components/DatePicker.vue

@@ -0,0 +1,99 @@
+<template>
+  <el-row>
+    <el-col :span="24">
+      <el-radio-group v-model="datePickType" label="选择方式" @change="handlePickerTypeChange">
+        <el-radio value="range">连续时间</el-radio>
+        <!-- <el-radio value="interval">间段时间</el-radio> -->
+        <el-radio value="any">任意时间</el-radio>
+      </el-radio-group>
+    </el-col>
+
+    <el-col :span="24" v-if="datePickType === 'range'">
+      <div class="demo-date-picker">
+        <div class="block">
+          <el-date-picker
+            v-model="rangeDates"
+            type="daterange"
+            format="YYYY/MM/DD"
+            value-format="YYYY/MM/DD"
+            range-separator="To"
+            start-placeholder="Start date"
+            end-placeholder="End date"
+            :unlink-panels="true"
+            @change="handleRangeDateChange"
+          />
+        </div>
+      </div>
+    </el-col>
+    <el-col :span="24" v-if="datePickType === 'any'">
+      <div class="block">
+        <el-date-picker
+          v-model="anyDates"
+          type="dates"
+          value-format="YYYY/MM/DD"
+          placeholder="Pick one or more dates"
+          @change="handleAnyDateChange"
+        />
+      </div>
+    </el-col>
+
+    <el-col :span="24">
+      <el-descriptions title="已选择团期">
+        <el-descriptions-item>
+          {{ pickedDates.length > 0 ? pickedDates : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </el-col>
+  </el-row>
+</template>
+
+<script setup>
+import { ref  } from 'vue'
+import moment from 'moment'
+
+const emit = defineEmits(['update-dates'])
+
+const datePickType = ref('range')
+const rangeDates = ref([])
+const anyDates = ref([])
+const pickedDates = ref([])
+
+const active = ref('1')
+
+const handlePickerTypeChange = (val) => {
+  datePickType.value = val
+  pickedDates.value = []
+  emit('update-dates', [])
+}
+
+const handleRangeDateChange = (val) => {
+  const start = val[0]
+  const end = val[1]
+
+  // Get all dates between start and end
+  const allDates = []
+  let currentDate = moment(start, "YYYY/MM/DD")
+  const endDate = moment(end, "YYYY/MM/DD")
+
+  while (currentDate <= endDate) {
+    allDates.push(currentDate.format('YYYY/MM/DD'))
+    currentDate = currentDate.add(1, 'day')
+  }
+
+  pickedDates.value = allDates
+  emit('update-dates', pickedDates.value)
+}
+
+const handleAnyDateChange = (val) => {
+  pickedDates.value = val
+  emit('update-dates', pickedDates.value)
+}
+
+</script>
+
+<style scoped>
+.desc {
+  word-break: break-all;
+  word-wrap: break-word;
+}
+</style>

hichina-admin-front/src/layouts/MainLayout.vue

@@ -41,6 +41,21 @@
     <q-drawer v-model="leftDrawerOpen" show-if-above bordered>
       <q-list>
         <q-item-label header> 功能菜单 </q-item-label>
+        <q-expansion-item
+          default-opened
+          icon="inventory_2"
+          label="产品管理（新）"
+          :content-inset-level="1"
+        >
+          <q-item clickable target="_blank" @click="goPage('/create-product-sku')">
+              <q-item-section avatar>
+                <q-icon :name="'production_quantity_limits'" />
+              </q-item-section>
+              <q-item-section>
+                <q-item-label>新增跟团产品</q-item-label>
+              </q-item-section>
+            </q-item>
+        </q-expansion-item>
         <q-expansion-item
           default-opened
           icon="inventory_2"

hichina-admin-front/src/pages/product/ProductComboForm.vue

@@ -0,0 +1,106 @@
+<template>
+
+<el-card>
+  <el-form :model="combo" label-width="auto" ref="formCombo" :rules="rules">
+    <el-row>
+      <el-col :span="10">
+        <el-form-item label="套餐名称" prop="name" :inline-message="true">
+          <el-input v-model="combo.name" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row>
+      <el-col :span="10">
+        <el-form-item label="天数" prop="days" :inline-message="true">
+          <el-input-number v-model="combo.days" :controls="false" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row>
+      <el-col :span="10">
+        <el-form-item label="成人价格" prop="adultPrice" :inline-message="true">
+          <el-input-number v-model="combo.adultPrice" :controls="false" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row>
+      <el-col :span="10">
+        <el-form-item label="儿童价格" prop="childPrice" :inline-message="true">
+          <el-input-number v-model="combo.childPrice" :controls="false" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row>
+      <el-col :span="10">
+        <el-form-item label="婴儿价格" prop="babyPrice" :inline-message="true">
+          <el-input-number v-model="combo.babyPrice" :controls="false" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row>
+      <el-col :span="10">
+        <el-form-item label="单房差" prop="singlePersonSupplement" :inline-message="true">
+          <el-input-number v-model="combo.singlePersonSupplement" :controls="false" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-button type="danger" @click="$emit('remove')">Remove</el-button>
+  </el-form>
+</el-card>
+
+</template>
+
+<script setup>
+
+import { defineProps, reactive, ref, toRefs } from 'vue'
+
+const props = defineProps({
+  combo: {
+    name: String,
+    days: Number,
+    adultPrice: Number,
+    childPrice: Number,
+    babyPrice: Number,
+    singlePersonSupplement: Number,
+  },
+})
+
+const {combo} = toRefs(props)
+
+const rules = reactive({
+  name: [
+    { required: true, message: '请输入套餐名称', trigger: 'blur' },
+  ],
+  days: [
+    { required: true, message: '请输入天数', trigger: 'blur' },
+  ],
+  adultPrice: [
+    { required: true, message: '请输入成人价格', trigger: 'blur' },
+  ],
+  childPrice: [
+    { required: true, message: '请输入儿童价格', trigger: 'blur' },
+  ],
+  babyPrice: [
+    { required: true, message: '请输入婴儿价格', trigger: 'blur' },
+  ],
+  singlePersonSupplement: [
+    { required: true, message: '请输入单房差', trigger: 'blur' },
+  ],
+})
+
+const formCombo = ref()
+
+</script>
+
+<style scoped>
+.el-form-item {
+  margin-bottom: 5px;
+}
+
+</style>

hichina-admin-front/src/pages/product/ProductSkuCreatePage.vue

@@ -0,0 +1,38 @@
+<template>
+    <br/>
+    <el-row>
+        <el-col :offset="1">
+            <p style="font-size: 24px;">创建产品</p>
+        </el-col>
+    </el-row>
+    <el-row></el-row>
+  <el-row>
+    <!-- <el-col :span="4"></el-col> -->
+    <el-col :span="22" :offset="1">
+        <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+            <el-tab-pane label="Tour" name="Tour">
+                <ProductTourForm />
+            </el-tab-pane>
+            <el-tab-pane label="Hotel" name="Hotel">Hotel</el-tab-pane>
+            <el-tab-pane label="Flight" name="Flight">Flight</el-tab-pane>
+            <el-tab-pane label="Flight & Hotel" name="Flight & Hotel">Flight & Hotel</el-tab-pane>
+            <el-tab-pane label="Local Special" name="Local Special">Local Special</el-tab-pane>
+        </el-tabs>
+    </el-col>
+  </el-row>
+
+
+
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import ProductTourForm from './ProductTourForm.vue'
+
+const activeName = ref('Tour')
+
+const handleClick = (tab, event) => {
+    //console.log(tab, event)
+}
+
+</script>

hichina-admin-front/src/pages/product/ProductTourForm.vue

@@ -0,0 +1,309 @@
+<template>
+
+<el-form
+  :model="form"
+  ref="formRef"
+  :rules="rules"
+  label-width="auto">
+    <el-row>
+      <el-col :span="10">
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-form-item label="封面图" prop="image">
+        <el-upload
+          class="avatar-uploader"
+          action="/"
+          :show-file-list="false"
+          :auto-upload="false"
+          :before-upload="beforeAvatarUpload"
+          :on-change="uploadImage"
+          accept=".jpeg, .jpg"
+        >
+          <img v-if="form.image != ''" :src="form.image" class="avatar" />
+          <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+        </el-upload>
+    </el-form-item>
+
+    <el-form-item label="内容" prop="content">
+      <div style="border: 1px solid #ccc">
+        <Toolbar
+          style="border-bottom: 1px solid #ccc"
+          :editor="editorRef"
+          :defaultConfig="toolbarConfig"
+        />
+        <Editor
+          style="height: 500px; overflow-y: hidden;"
+          v-model="form.content"
+          :defaultConfig="editorConfig"
+          @onCreated="handleCreated"
+        />
+      </div>
+    </el-form-item>
+
+    <el-form-item label="团期" prop="dates">
+      <DatePicker @update-dates="(dates) => form.dates = dates" />
+    </el-form-item>
+
+    <el-row>
+      <el-col :span="10">
+        <el-form-item label="供应商" prop="vendor">
+          <el-input v-model="form.vendor" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-form-item label="简述" prop="summary">
+      <el-input
+        v-model="form.summary"
+        :rows="2"
+        type="textarea"
+        placeholder="Please input"
+      />
+    </el-form-item>
+
+    <el-divider />
+
+    <div>
+      <p style="font-size: 20px;">套餐</p>
+      <el-row>
+        <el-col :span="24">
+          <el-button type="primary" @click="addCombo">新增套餐</el-button>
+        </el-col>
+      </el-row>
+      <br/>
+      <template v-for="(combo, index) in form.combos" :key="index">
+        <el-col :span="24">
+          <ProductComboForm :combo="form.combos[index]"
+            @remove="removeCombo(index)" ref="comboFormRefs"/>
+        </el-col>
+        <br/>
+      </template>
+    </div>
+
+    <el-button type="primary" @click="saveSkus(formRef)">
+        Save
+    </el-button>
+  </el-form>
+</template>
+
+
+<script setup>
+import { Plus } from '@element-plus/icons-vue'
+import { ElMessage } from 'element-plus'
+import { reactive, ref, onBeforeUnmount, shallowRef, onMounted } from 'vue'
+import ProductComboForm from './ProductComboForm.vue'
+import DatePicker from 'components/DatePicker.vue'
+import '@wangeditor/editor/dist/css/style.css' // 引入 css
+import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
+import { api } from 'src/boot/axios'
+
+const formRef = ref()
+const form = reactive({
+  name: '',
+  image: '',
+  content: '',
+  dates: [],
+  vendor: '',
+  summary: '',
+  combos: [],
+})
+
+const rules = reactive({
+  name: [
+    { required: true, message: '请输入名称', trigger: 'blur' },
+  ],
+  image: [
+    { required: true, message: '请上传封面图', trigger: 'change' },
+  ],
+  content: [
+    { required: true, message: '请输入内容', trigger: 'blur' },
+  ],
+  dates: [
+    { required: true, message: '请选择团期', trigger: 'change' },
+  ],
+  vendor: [
+    { required: true, message: '请输入供应商', trigger: 'blur' },
+  ],
+  summary: [
+    { required: true, message: '请输入简述', trigger: 'blur' },
+    { max: 200, message: '简述不能超过200个字符', trigger: 'blur'}
+  ],
+  combos: [
+    { required: true, message: '请至少添加一个套餐', trigger: 'change'}
+  ],
+})
+
+const comboFormRefs = ref([])
+
+function validateComboForms() {
+  for (const ref of comboFormRefs.value) {
+    const form = ref.$refs.formCombo;
+      form.validate((valid) => {
+        if (!valid) {
+          return false
+        }
+      });
+  }
+  return true
+}
+
+// 编辑器实例，必须用 shallowRef
+const editorRef = shallowRef()
+const toolbarConfig = {}
+const editorConfig = {
+  placeholder: '请输入内容...',
+  MENU_CONF: {}
+}
+editorConfig.MENU_CONF['uploadImage'] = {
+  async customUpload(file, insertFn) {
+    const formData = new FormData();
+    formData.append("imageFile", file);
+    formData.append("expectedType", "blogImage");
+    try {
+      const res = await api.post("/api/v1/image/upload", formData)
+      console.log(res.data)
+      insertFn(res.data.data);
+    } catch (err) {
+      ElMessage.error('上传图片失败')
+      console.log('Upload Error: ', err)
+    }
+  }
+}
+
+// 组件销毁时，也及时销毁编辑器
+onBeforeUnmount(() => {
+    const editor = editorRef.value
+    if (editor == null) return
+    editor.destroy()
+})
+
+const handleCreated = (editor) => {
+  editorRef.value = editor // 记录 editor 实例，重要！
+}
+
+const beforeAvatarUpload = (rawFile) => {
+  if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('picture size can not exceed 2MB!')
+    return false
+  }
+  return true
+}
+
+const uploadImage = async (file) => {
+  const formData = new FormData()
+  formData.append('imageFile', file.raw)
+  formData.append('expectedType', 'blogImage')
+  await api.post('/api/v1/image/upload', formData)
+    .then(res => {
+      console.log(res.data)
+      form.image = res.data.data
+    }).catch(err => {
+      ElMessage.error('上传图片失败')
+      console.log('Upload Error: ', err)
+    })
+}
+
+
+const addCombo = () => {
+  form.combos.push({
+    name: '',
+    days: 1,
+    adultPrice: 0,
+    childPrice: 0,
+    babyPrice: 0,
+    singlePersonSupplement: 0,
+  })
+}
+
+const removeCombo = (index) => {
+  if (form.combos.length === 1) {
+    ElMessage.error('至少需要一个套餐')
+    return
+  }
+  form.combos.splice(index, 1)
+}
+
+addCombo()
+
+function buildRequest() {
+
+  const attributes = []
+  for (const combo of form.combos) {
+
+    attributes.push({
+      '[image]2dea54f4-9b9c-413a-8b3a-0caf273283d2': form.image,
+      '[datestring]f0b807e5-d1a6-4454-a400-7905a4fea492': form.dates.join(';'),
+      '[string]11cd8b32-c4f6-47db-8b8a-486c992bf43b': combo.name,
+      '[integer]8cc865ff-b30f-4f00-b426-9e64418e5100': combo.days,
+      '[string]04a54b65-a1f3-45d9-955c-40cf88f21b82': form.vendor,
+      '[integer]e228b843-e054-41f8-91dd-19663460df54': combo.adultPrice,
+      '[integer]c4c845a7-4bef-46d8-a5ad-d72a5464e8b1': combo.childPrice,
+      '[integer]448406cb-b68f-439e-9da8-148d78ae8404': combo.babyPrice,
+      '[integer]d4825026-3ad8-4861-8e8f-e980b55fe67b': combo.singlePersonSupplement,
+      '[string]f3cac6ed-8e87-4fb9-a912-bd87f483b4d5': form.summary,
+    })
+  }
+
+  return {
+    productName: form.name,
+    productDescription: form.content,
+    productTypeId: '3a53caed-b788-4290-896d-7922532ad769',
+    comboCustomPropertyBags: attributes,
+  }
+}
+
+async function saveSkus(formEl) {
+  if (!formEl) {
+    return
+  }
+  const valid = validateComboForms() && await formEl.validate((valid, fields) => {});
+  if (!valid) {
+      ElMessage.error(`请检查表单`)
+      return
+  }
+
+  const request = buildRequest()
+  try {
+    const res = await api.post('/api/v1/productsku/batch', request)
+    console.log(res.data)
+
+    const data = res.data
+    if (data.ok) {
+      ElMessage.success('保存成功')
+    } else {
+      ElMessage.error('保存失败')
+    }
+  } catch (err) {
+    ElMessage.error('保存失败')
+    console.log('Save Error: ', err)
+  }
+}
+
+</script>
+
+<style scoped>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>

hichina-admin-front/src/router/routes.js

@@ -50,6 +50,16 @@ const routes = [
       },
     ],
   },
+  {
+    path: "/create-product-sku",
+    component: () => import("layouts/MainLayout.vue"),
+    children: [
+      {
+        path: "",
+        component: () => import("pages/product/ProductSkuCreatePage.vue"),
+      },
+    ]
+  },
   {
     path: "/product-sku",
     component: () => import("layouts/MainLayout.vue"),

hichina-main-back/README.md

@@ -0,0 +1,36 @@
+# API Service
+
+## Environment preparation
+
+### Prerequisite
+
+- JDK 17
+- Gradle 7
+
+### with docker
+
+```shell
+# for logs
+mkdir -p /opt/hichina
+
+# db
+docker run --name mysql_unified_hichina -p 3306:3306 -e MYSQL_ROOT_PASSWORD=Passw0rd -d mysql
+docker exec -it mysql_unified_hichina mysql -u root -p -e "create database unified_hichina" 
+
+docker run --name mongo_unified_hichina -p 27017:27017 -d mongo
+
+docker run --name redis_hichina -p 6379:6379 -d redis
+```
+
+And Run SpringBoot !!!
+
+## Migration
+
+[Liquibase](https://docs.liquibase.com/concepts/introduction-to-liquibase.html) with Spring
+
+See `db/changelog/liquibase-changeLog.xml`
+
+
+
+
+

hichina-main-back/src/main/resources/logback.xml

@@ -12,7 +12,7 @@
       <!-- Name of the file where the log messages are written -->
 
       <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-        <fileNamePattern>/tmp/logs/hichinamainback/hichinamainbacklog-%d{yyyy-MM-dd}-dev.log</fileNamePattern>
+        <fileNamePattern>/opt/hichina/logs/hichinamainback/hichinamainbacklog-%d{yyyy-MM-dd}-dev.log</fileNamePattern>
         <maxHistory>30</maxHistory>
       </rollingPolicy>
       <encoder>
@@ -40,7 +40,7 @@
       <!-- Name of the file where the log messages are written -->
 
       <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-        <fileNamePattern>/root/Downloads/logs/hichinamainbackqa/hichinamainback-%d{yyyy-MM-dd}-qa.log</fileNamePattern>
+        <fileNamePattern>/opt/hichina/logs/hichinamainbackqa/hichinamainback-%d{yyyy-MM-dd}-qa.log</fileNamePattern>
         <maxHistory>30</maxHistory>
       </rollingPolicy>
       <encoder>
@@ -67,7 +67,7 @@
       <!-- Name of the file where the log messages are written -->
 
       <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-        <fileNamePattern>/root/Downloads/logs/hichinamainbackprod/hichinamainback-%d{yyyy-MM-dd}-prod.log</fileNamePattern>
+        <fileNamePattern>/opt/hichina/logs/hichinamainbackprod/hichinamainback-%d{yyyy-MM-dd}-prod.log</fileNamePattern>
         <maxHistory>30</maxHistory>
       </rollingPolicy>
       <encoder>