commit

PddServer/src/main/java/org/ta/pddserver/config/PddAPIConfig.java

@@ -3,25 +3,25 @@ package org.ta.pddserver.config;
 public class PddAPIConfig {
     // 临沂海际韩国集运 生产环境参数
     // 应用基础参数
-    public static final String CLIENT_ID = "8f5f3f9c92e847b2894fc9c0afce3d61";
-    public static final String CLIENT_SECRET = "281d79ad5117d20a51efb9e7b0d5f7ee336399b0";
-    // 基础API地址
-    public static final String URL = "https://ark-api.pinduoduo.com/ark/router";
-    // 工单API地址
-    public static final String URL_GD = "https://gw-api.pinduoduo.com/api/router";
-
-    // 基础API地址
+//    public static final String CLIENT_ID = "8f5f3f9c92e847b2894fc9c0afce3d61";
+//    public static final String CLIENT_SECRET = "281d79ad5117d20a51efb9e7b0d5f7ee336399b0";
+//    // 基础API地址
+//    public static final String URL = "https://ark-api.pinduoduo.com/ark/router";
+//    // 工单API地址
+//    public static final String URL_GD = "https://gw-api.pinduoduo.com/api/router";
+//
+//    // 基础API地址
     public static final String BASE_URL = "https://gw-api.pinduoduo.com/api/router";
 
 
     // 临沂海际韩国集运 测试环境参数
-//    // 应用基础参数
-//    public static final String CLIENT_ID = "d0217707e1194c46b57e696ac7619a06";
-//    public static final String CLIENT_SECRET = "a5aba84483d8387030899f01276b06a194942470";
-//    // 基础API地址
-//    public static final String URL = "https://opengw-api.hutaojie.com/ark/router";
-//    // 工单API地址
-//    public static final String URL_GD = "https://opengw-api.hutaojie.com/api/router";
+    // 应用基础参数
+    public static final String CLIENT_ID = "d0217707e1194c46b57e696ac7619a06";
+    public static final String CLIENT_SECRET = "a5aba84483d8387030899f01276b06a194942470";
+    // 基础API地址
+    public static final String URL = "https://opengw-api.hutaojie.com/ark/router";
+    // 工单API地址
+    public static final String URL_GD = "https://opengw-api.hutaojie.com/api/router";
 
 
 

PddServer/src/main/java/org/ta/pddserver/controller/DataGetController.java

@@ -98,7 +98,7 @@ public class DataGetController {
         PddLogisticsCoTrackNotifyResponse response = JSON.parseObject(resp, PddLogisticsCoTrackNotifyResponse.class);
         log.info("response = {}", JSON.toJSONString(response));
 
-        return JsonResponse.generateLocalCommonSuccessResponse(true);
+        return JsonResponse.generateLocalCommonSuccessResponse(true, "操作成功");
     }
 
     /*出库详情*/
@@ -113,7 +113,7 @@ public class DataGetController {
         map.put("detail", list);
         map.put("receiver", collectOrderReceiverDetailResponse);
         map.put("logistics", logistics);
-        return JsonResponse.generateLocalCommonSuccessResponse(map);
+        return JsonResponse.generateLocalCommonSuccessResponse(map, "");
     }
 
     /*待拣货列表*/
@@ -123,7 +123,7 @@ public class DataGetController {
         if (collectOrderListRequest.getSize() > 100) {
             collectOrderListRequest.setSize(100);
         }
-        return JsonResponse.generateLocalCommonSuccessResponse(collectOrderImpl.getList(collectOrderListRequest));
+        return JsonResponse.generateLocalCommonSuccessResponse(collectOrderImpl.getList(collectOrderListRequest), "");
     }
 
     private PddLogisticsCoTrackNotifyRequest.DataObject getDataObject(String code) {

PddServer/src/main/java/org/ta/pddserver/controller/PddGDController.java

@@ -54,7 +54,7 @@ public class PddGDController {
     /*工单列表*/
     @PostMapping("/ticketList")
     public JSONObject ticketList(HttpServletRequest request, @RequestBody TicketListRequest ticketListRequest) {
-        return JsonResponse.generateLocalCommonSuccessResponse(gdTicketImpl.getListByRequest(ticketListRequest));
+        return JsonResponse.generateLocalCommonSuccessResponse(gdTicketImpl.getListByRequest(ticketListRequest), "");
     }
 
     /*工单详情*/
@@ -75,7 +75,7 @@ public class PddGDController {
         map.put("attachment", list);
         map.put("reply", gDReplyList);
 
-        return JsonResponse.generateLocalCommonSuccessResponse(map);
+        return JsonResponse.generateLocalCommonSuccessResponse(map, "");
     }
 
     /*上传图片*/
@@ -97,7 +97,7 @@ public class PddGDController {
         Map<String, Object> map = new HashMap<>();
         map.put("image", image);
 
-        return JsonResponse.generateLocalCommonSuccessResponse(map);
+        return JsonResponse.generateLocalCommonSuccessResponse(map, "");
     }
 
 
@@ -170,7 +170,7 @@ public class PddGDController {
             }
 
 
-            return JsonResponse.generateLocalCommonSuccessResponse(replyRepsonse.getIs_success());
+            return JsonResponse.generateLocalCommonSuccessResponse(replyRepsonse.getIs_success(), "");
         }
 
 
@@ -179,7 +179,7 @@ public class PddGDController {
     @PostMapping("/ticketFresh")
     public JSONObject freshFromPdd(HttpServletRequest request) {
         gdOperator.getGdTickets();
-        return JsonResponse.generateLocalCommonSuccessResponse("OK");
+        return JsonResponse.generateLocalCommonSuccessResponse("", "OK");
     }
 
 }

PddServer/src/main/java/org/ta/pddserver/entity/CollectOrderEntity.java

@@ -89,4 +89,10 @@ public class CollectOrderEntity {
     @TableField(value = "stationCode")
     private String stationCode;
 
+    /**
+     * 打印次数
+     */
+    @TableField(value = "num")
+    private Integer num;
+
 }

PddServer/src/main/java/org/ta/pddserver/entity/UnpackNoticeEntity.java

@@ -52,6 +52,9 @@ public class UnpackNoticeEntity {
     @TableField(value = "receiverDetail")
     private String receiverDetail;
 
+    @TableField(value = "num")
+    private Integer num;
+
     public String getUid() {
         return uid;
     }

PddServer/src/main/java/org/ta/pddserver/lotto/ImagePdfCollectGenerator.java

+package org.ta.pddserver.lotto;
+
+import com.itextpdf.io.image.ImageData;
+import com.itextpdf.io.image.ImageDataFactory;
+import com.itextpdf.kernel.geom.PageSize;
+import com.itextpdf.kernel.pdf.PdfDocument;
+import com.itextpdf.kernel.pdf.PdfWriter;
+import com.itextpdf.layout.Document;
+import com.itextpdf.layout.element.Image;
+import com.itextpdf.layout.properties.HorizontalAlignment;
+
+import java.io.ByteArrayOutputStream;
+
+public class ImagePdfCollectGenerator {
+
+    public static byte[] generatePdfWithCollectTextImage(String orderCode)  {
+        try {
+            // 1. 将文字转为图片（示例：韩文“안녕하세요，世界！”）
+            byte[] imageBytes = TextToImageCollectUtils.textToImage(
+                    orderCode
+
+            );
+//        return imageBytes;
+
+
+            // 2. 初始化PDF
+            ByteArrayOutputStream pdfBaos = new ByteArrayOutputStream();
+            PdfWriter writer = new PdfWriter(pdfBaos);
+            PdfDocument pdfDoc = new PdfDocument(writer);
+            Document document = new Document(pdfDoc, new PageSize((int) (150 * 300 / 25.4), (int) (100 * 300 / 25.4)));
+
+            // 3. 将图片嵌入PDF
+            ImageData imageData = ImageDataFactory.create(imageBytes);
+            Image image = new Image(imageData);
+            // 设置图片在PDF中居中显示
+            image.setHorizontalAlignment(HorizontalAlignment.LEFT);
+            document.add(image);
+
+            // 4. 关闭文档
+            document.close();
+            return pdfBaos.toByteArray();
+        }catch (Exception e){
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+
+    public static byte[] generateCode() throws Exception {
+        ByteArrayOutputStream pdfBaos = new ByteArrayOutputStream();
+        PdfWriter writer = new PdfWriter(pdfBaos);
+        PdfDocument pdfDoc = new PdfDocument(writer);
+
+        // 2. 初始化PDF
+        Document document = new Document(pdfDoc, new PageSize((int) (150 * 300 / 25.4), (int) (100 * 300 / 25.4)));
+
+        for (int i = 1; i < 10; i ++) {
+            for (int i1 = 1; i1 < 12; i1 ++) {
+                for (int i2 = 1; i2 < 5; i2 ++) {
+                    for (int i3 = 1; i3 < 3; i3 ++) {
+                        if (i3 == 2 && (i2 == 1|| i2 == 4)) {
+                            continue;
+                        }
+                        // 1. 将文字转为图片（示例：韩文“안녕하세요，世界！”）
+                        String code = "A" + i + "-" + i1 + "-" + i2 + "-" + i3;
+                        byte[] imageBytes = TextToImageUtils.commonBarCodeToImage(code);
+
+                        // 3. 将图片嵌入PDF
+                        ImageData imageData = ImageDataFactory.create(imageBytes);
+                        Image image = new Image(imageData);
+                        // 设置图片在PDF中居中显示
+                        image.setHorizontalAlignment(HorizontalAlignment.LEFT);
+                        document.add(image);
+                    }
+                }
+
+
+
+            }
+
+
+        }
+        // 4. 关闭文档
+        document.close();
+        return pdfBaos.toByteArray();
+    }
+}
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/lotto/ImagePdfUnpackGenerator.java

+package org.ta.pddserver.lotto;
+
+import com.itextpdf.io.image.ImageData;
+import com.itextpdf.io.image.ImageDataFactory;
+import com.itextpdf.kernel.geom.PageSize;
+import com.itextpdf.kernel.pdf.PdfDocument;
+import com.itextpdf.kernel.pdf.PdfWriter;
+import com.itextpdf.layout.Document;
+import com.itextpdf.layout.element.Image;
+import com.itextpdf.layout.properties.HorizontalAlignment;
+
+import java.io.ByteArrayOutputStream;
+
+public class ImagePdfUnpackGenerator {
+
+    public static byte[] generatePdfWithUnpackTextImage(String orderCode)  {
+        try {
+            // 1. 将文字转为图片（示例：韩文“안녕하세요，世界！”）
+            byte[] imageBytes = TextToImageUnpackUtils.textToImage(
+                    orderCode
+
+            );
+//        return imageBytes;
+
+
+            // 2. 初始化PDF
+            ByteArrayOutputStream pdfBaos = new ByteArrayOutputStream();
+            PdfWriter writer = new PdfWriter(pdfBaos);
+            PdfDocument pdfDoc = new PdfDocument(writer);
+            Document document = new Document(pdfDoc, new PageSize((int) (150 * 300 / 25.4), (int) (100 * 300 / 25.4)));
+
+            // 3. 将图片嵌入PDF
+            ImageData imageData = ImageDataFactory.create(imageBytes);
+            Image image = new Image(imageData);
+            // 设置图片在PDF中居中显示
+            image.setHorizontalAlignment(HorizontalAlignment.LEFT);
+            document.add(image);
+
+            // 4. 关闭文档
+            document.close();
+            return pdfBaos.toByteArray();
+        }catch (Exception e){
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+
+    public static byte[] generateCode() throws Exception {
+        ByteArrayOutputStream pdfBaos = new ByteArrayOutputStream();
+        PdfWriter writer = new PdfWriter(pdfBaos);
+        PdfDocument pdfDoc = new PdfDocument(writer);
+
+        // 2. 初始化PDF
+        Document document = new Document(pdfDoc, new PageSize((int) (150 * 300 / 25.4), (int) (100 * 300 / 25.4)));
+
+        for (int i = 1; i < 10; i ++) {
+            for (int i1 = 1; i1 < 12; i1 ++) {
+                for (int i2 = 1; i2 < 5; i2 ++) {
+                    for (int i3 = 1; i3 < 3; i3 ++) {
+                        if (i3 == 2 && (i2 == 1|| i2 == 4)) {
+                            continue;
+                        }
+                        // 1. 将文字转为图片（示例：韩文“안녕하세요，世界！”）
+                        String code = "A" + i + "-" + i1 + "-" + i2 + "-" + i3;
+                        byte[] imageBytes = TextToImageUtils.commonBarCodeToImage(code);
+
+                        // 3. 将图片嵌入PDF
+                        ImageData imageData = ImageDataFactory.create(imageBytes);
+                        Image image = new Image(imageData);
+                        // 设置图片在PDF中居中显示
+                        image.setHorizontalAlignment(HorizontalAlignment.LEFT);
+                        document.add(image);
+                    }
+                }
+
+
+
+            }
+
+
+        }
+        // 4. 关闭文档
+        document.close();
+        return pdfBaos.toByteArray();
+    }
+}
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/mapper/CollectOrderMapper.java

@@ -30,10 +30,10 @@ public interface CollectOrderMapper extends BaseMapper<CollectOrderEntity> {
     @Select("SELECT `uid`, `orderCode`, `itemQuantityTotal`, `tradeOrderActualAmountTotal`,`segmentCode`, `consoType`, `deliveryType` FROM `collect_order` WHERE `orderCode` = #{orderCode};")
     CollectOrderInfoResponse getInfoByOrderCode(@Param("orderCode") String orderCode);
 
-    @Select("SELECT COUNT(*) FROM (SELECT a.`uid` FROM `collect_order` a LEFT JOIN `collect_mail_detail` b ON a.`orderCode` = b.`orderCode` WHERE a.`orderCode` LIKE '%${orderCode}%' AND a.`status` LIKE '%${status}%' GROUP BY a.`uid`) t; ")
+    @Select("SELECT COUNT(*) FROM (SELECT a.`uid` FROM `collect_order` a LEFT JOIN `collect_mail_detail` b ON a.`orderCode` = b.`orderCode` WHERE a.`orderCode` LIKE '%${orderCode}%' AND a.`status` LIKE '%${status}%' ${str} GROUP BY a.`uid`) t; ")
     Integer countUsable(CollectOrderListRequest param);
 
-    @Select("SELECT a.`uid`, a.`orderCode`, a.`itemQuantityTotal`, GROUP_CONCAT(b.`mailNo` SEPARATOR ';') as mailNo, a.`created` FROM `collect_order` a LEFT JOIN `collect_mail_detail` b ON a.`orderCode` = b.`orderCode` WHERE a.`orderCode` LIKE '%${orderCode}%' AND a.`status` LIKE '%${status}%' GROUP BY a.`uid` ORDER BY a.`created` DESC LIMIT #{offset}, #{size}; ")
+    @Select("SELECT a.`uid`, a.`orderCode`, a.`itemQuantityTotal`, GROUP_CONCAT(b.`mailNo` SEPARATOR ';') as mailNo, a.`created`, a.`num` FROM `collect_order` a LEFT JOIN `collect_mail_detail` b ON a.`orderCode` = b.`orderCode` WHERE a.`orderCode` LIKE '%${orderCode}%' AND a.`status` LIKE '%${status}%' ${str} GROUP BY a.`uid` ORDER BY a.`created` DESC LIMIT #{offset}, #{size}; ")
     List<CollectOrderListResponse> getListByRequest(CollectOrderListRequest param);
 
     @Select("SELECT * FROM `collect_order` WHERE `orderCode` = #{orderCode};")

PddServer/src/main/java/org/ta/pddserver/mapper/StorageMapper.java

@@ -35,10 +35,10 @@ public interface StorageMapper extends BaseMapper<StorageEntity> {
     @Select("SELECT `code`, `place` FROM  `storage` WHERE `mailNo` = #{mailNo}")
     StorageResponse storageSelect(@Param("mailNo") String mailNo);
 
-    @Select("SELECT a.`mailNo`, a.`code` , a.`place` FROM `storage` a, `unpack_mail_detail` b WHERE b.`orderCode` = #{logisticsOrderCode} AND b.`mailNo` = a.`mailNo`")
+    @Select("SELECT a.`mailNo`, a.`code` , a.`place` FROM `storage` a, `unpack_mail_detail` b WHERE b.`orderCode` = #{logisticsOrderCode} AND b.`mailNo` = a.`mailNo` ORDER BY a.`place`")
     List<StorageListResponse> storageUnpackList(@Param("logisticsOrderCode") String logisticsOrderCode);
 
-    @Select("SELECT a.`mailNo`, a.`code` , a.`place` FROM `storage` a, `collect_mail_detail` b WHERE b.`orderCode` = #{logisticsOrderCode} AND b.`mailNo` = a.`mailNo`")
+    @Select("SELECT a.`mailNo`, a.`code` , a.`place` FROM `storage` a, `collect_mail_detail` b WHERE b.`orderCode` = #{logisticsOrderCode} AND b.`mailNo` = a.`mailNo` ORDER BY a.`place`")
     List<StorageListResponse> storageCollectList(@Param("logisticsOrderCode") String logisticsOrderCode);
 
     @Delete("DELETE FROM `storage` WHERE `mailNo` IN ${ids}")

PddServer/src/main/java/org/ta/pddserver/mapper/UnpackNoticeMapper.java

@@ -24,10 +24,10 @@ public interface UnpackNoticeMapper extends BaseMapper<UnpackNoticeEntity> {
     UnpackNoticeEntity selectByOrderCode(String orderCode);
 
 
-    @Select("SELECT count(`uid`) FROM `unpack_notice` WHERE `status` = 1 ")
+    @Select("SELECT count(`uid`) FROM `unpack_notice` WHERE `status` = 1 ${str}")
     Integer countUsable(UnpackNoticeListRequest param);
 
-    @Select("SELECT `orderCode`, `status`, `mailDetails` FROM `unpack_notice` WHERE `status` = 1 ORDER BY `uid` DESC LIMIT #{offset}, #{size}; ")
+    @Select("SELECT `orderCode`, `status`, `mailDetails`, `num` FROM `unpack_notice` WHERE `status` = 1 ${str} ORDER BY `uid` DESC LIMIT #{offset}, #{size}; ")
     List<UnpackNoticeListResponse> getListByRequest(UnpackNoticeListRequest param);
 
     @Update("UPDATE `unpack_notice` SET `status` = ${status} WHERE `orderCode` = #{orderCode} ")

PddServer/src/main/java/org/ta/pddserver/model/api/request/CollectOrderListRequest.java

@@ -25,4 +25,8 @@ public class CollectOrderListRequest extends PageTool {
             requiredMode = Schema.RequiredMode.REQUIRED // 必填
     )
     private int status;
+
+    private int num;
+
+    private String str;
 }

PddServer/src/main/java/org/ta/pddserver/model/api/request/UnpackNoticeListRequest.java

@@ -6,5 +6,7 @@ import org.ta.pddserver.model.common.PageTool;
 @Data
 public class UnpackNoticeListRequest extends PageTool {
 
+    private int num;
 
+    private String str;
 }

PddServer/src/main/java/org/ta/pddserver/model/api/request/UnpackNoticeRequest.java

+package org.ta.pddserver.model.api.request;
+
+import lombok.Data;
+import org.ta.pddserver.model.common.PageTool;
+
+@Data
+public class UnpackNoticeRequest {
+
+    private String orderCode;
+
+
+}

PddServer/src/main/java/org/ta/pddserver/model/api/response/CollectOrderListResponse.java

@@ -15,4 +15,5 @@ public class CollectOrderListResponse {
 
     private String created;
 
+    private int num;
 }

PddServer/src/main/java/org/ta/pddserver/model/api/response/UnpackNoticeListResponse.java

@@ -10,4 +10,6 @@ public class UnpackNoticeListResponse {
     private int status;
 
     private String mailDetails;
+
+    private int num;
 }

PddServer/src/main/java/org/ta/pddserver/service/impl/AreaImpl.java

@@ -36,7 +36,7 @@ public class AreaImpl extends ServiceImpl<AreaMapper, AreaEntity> implements Are
         AreaEntity ae = baseMapper.getInfoByCode(areaEntity.getCode());
         if(ae ==null){
             baseMapper.insert(areaEntity);
-            return JsonResponse.generateLocalCommonSuccessResponse(true);
+            return JsonResponse.generateLocalCommonSuccessResponse(true,"");
         }else {
             return JsonResponse.generateLocalCommonFailedResponse("-1", "区域已存在");
         }
@@ -61,7 +61,7 @@ public class AreaImpl extends ServiceImpl<AreaMapper, AreaEntity> implements Are
                 }
             }
         }
-        return JsonResponse.generateLocalCommonSuccessResponse(true);
+        return JsonResponse.generateLocalCommonSuccessResponse(true,"");
     }
 
     public JSONObject areaDele(AreaEntity areaEntity) {
@@ -74,7 +74,7 @@ public class AreaImpl extends ServiceImpl<AreaMapper, AreaEntity> implements Are
         ae.setState(-1);
         baseMapper.updateById(ae);
 
-        return JsonResponse.generateLocalCommonSuccessResponse(true);
+        return JsonResponse.generateLocalCommonSuccessResponse(true,"");
     }
 
     public List<AreaEntity> getList() {

PddServer/src/main/java/org/ta/pddserver/service/impl/CollectOrderImpl.java

@@ -29,6 +29,14 @@ public class CollectOrderImpl extends ServiceImpl<CollectOrderMapper, CollectOrd
     }
 
     public Map getList(CollectOrderListRequest param) {
+        if(param.getNum() == 0){
+            param.setStr(" AND a.`num` = 0");
+        }else if(param.getNum() == 1){
+            param.setStr(" AND a.`num` > 0");
+        }else {
+            param.setStr("");
+        }
+
         Integer count = baseMapper.countUsable(param);
         param.checkPage(count,20);
         List<CollectOrderListResponse> list = baseMapper.getListByRequest(param);

PddServer/src/main/java/org/ta/pddserver/service/impl/StorageImpl.java

@@ -11,7 +11,9 @@ import org.ta.pddserver.model.api.response.StorageListResponse;
 import org.ta.pddserver.model.api.response.StorageResponse;
 import org.ta.pddserver.service.StorageService;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 @Service
@@ -46,11 +48,37 @@ public class StorageImpl extends ServiceImpl<StorageMapper, StorageEntity> imple
         return baseMapper.storageSelect(mailNo);
     }
 
-    public List<StorageListResponse> storageList(String logisticsOrderCode) {
+    public Map<String, Object> storageList(String logisticsOrderCode) {
+
+        Map<String, Object> map = new HashMap<>();
+
+        List<StorageListResponse> list = baseMapper.storageUnpackList(logisticsOrderCode);
+
+        map.put("type", "unpack");
+
+        if (list == null || list.isEmpty()) {
+            list = baseMapper.storageCollectList(logisticsOrderCode);
+
+            map.put("type", "collect");
+        }
+
+        map.put("list", list);
+
+        return map;
+    }
+
+    public List<StorageListResponse> storageLists(String logisticsOrderCode) {
+
+
         List<StorageListResponse> list = baseMapper.storageUnpackList(logisticsOrderCode);
+
+
         if (list == null || list.isEmpty()) {
             list = baseMapper.storageCollectList(logisticsOrderCode);
+
         }
+
+
         return list;
     }
 

PddServer/src/main/java/org/ta/pddserver/service/impl/UnpackNoticeImpl.java

@@ -22,6 +22,14 @@ public class UnpackNoticeImpl extends ServiceImpl<UnpackNoticeMapper, UnpackNoti
     }
 
     public Map<String, Object> getListByRequest(UnpackNoticeListRequest param) {
+        if(param.getNum() == 0){
+            param.setStr(" AND `num` = 0");
+        }else if(param.getNum() == 1){
+            param.setStr(" AND `num` > 0");
+        }else {
+            param.setStr("");
+        }
+
         Integer count = baseMapper.countUsable(param);
         param.checkPage(count,20);
         List<UnpackNoticeListResponse> list = baseMapper.getListByRequest(param);

PddServer/src/main/java/org/ta/pddserver/utils/JsonResponse.java

@@ -38,10 +38,11 @@ public class JsonResponse {
         return resp;
     }
 
-    public static JSONObject generateLocalCommonSuccessResponse(Object data) {
+    public static JSONObject generateLocalCommonSuccessResponse(Object data, String message) {
         JSONObject resp = new JSONObject();
         resp.put("success", true);
         resp.put("reason_code", "0");
+        resp.put("message", message);
         if (data != null) {
             resp.put("data", data);
         }

PddServer/src/main/resources/application.yaml

@@ -7,12 +7,12 @@ spring:
 
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://192.168.2.222:3306/pdd_api?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
-#    username: root
-#    password: root
-    url: jdbc:mysql://lyhj-mysql.mysql.rds.aliyuncs.com:3306/pdd_prod?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
-    username: pdd
-    password: pdd123
+    url: jdbc:mysql://192.168.2.222:3306/pdd_api?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
+    username: root
+    password: root
+#    url: jdbc:mysql://lyhj-mysql.mysql.rds.aliyuncs.com:3306/pdd_prod?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
+#    username: pdd
+#    password: pdd123
 #    url: jdbc:mysql://rm-j6cv8n7zx12x0sqreuo.mysql.rds.aliyuncs.com:3306/pdd_prod?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
 #    username: pdd
 #    password: pdd123
@@ -26,8 +26,8 @@ spring:
   application:
     name: PddServer
 server:
-#  port: 9000 # 正式端口号 - 向拼多多正式环境开放接口
-  port: 9100 # 正式端口号 - 向海际系统正式环境开放接口
+  port: 9000 # 正式端口号 - 向拼多多正式环境开放接口
+#  port: 9100 # 正式端口号 - 向海际系统正式环境开放接口
 #  port: 8600 # 测试端口号
 logging:
   level:
@@ -41,4 +41,4 @@ mybatis-plus:
 pdd:
   jyt: 0
   gd: 0
-  lotto: 1
+  lotto: 0
\ No newline at end of file