Merge branch 'dev-xym-update-test' of Server/long-article-manage into master

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/CardServiceImpl.java

@@ -40,6 +40,9 @@ public class CardServiceImpl implements CardService {
     @ApolloJsonValue("${pageTestAccount:[]}")
     private JSONArray pageTestAccount;
 
+    @ApolloJsonValue("${updateVideoMap:{}}")
+    private Map<String, String> updateVideoMap;
+
     @Autowired
     AigcService aigcService;
 
@@ -70,7 +73,7 @@ public class CardServiceImpl implements CardService {
     private static final List<String> useSmallPlayImgPathList = new ArrayList<String>();
 
 
-    public JSONObject createGzhPath(String videoId, String sharedUid, String ghId, Integer miniProgramType) throws UnsupportedEncodingException {
+    public JSONObject createGzhPath(String videoId, String sharedUid, String ghId, Integer miniProgramType, Integer index) throws UnsupportedEncodingException {
         String rootShareId = UUID.randomUUID().toString();
         String rootSourceId;
         switch (miniProgramType) {
@@ -104,6 +107,9 @@ public class CardServiceImpl implements CardService {
         if (!CollectionUtils.isEmpty(pageTestAccount) && pageTestAccount.contains(ghId)) {
             videoId = "0";
         }
+        if(index == 1 && !updateVideoMap.isEmpty() && updateVideoMap.containsKey(ghId)){
+            videoId = updateVideoMap.get(ghId);
+        }
         String url = String.format("pages/user-videos?id=%s&su=%s&fromGzh=1&rootShareId=%s&shareId=%s&rootSourceId=%s",
                 videoId, sharedUid, rootShareId, rootShareId, rootSourceId);
         String productionPath = String.format("pages/category?jumpPage=%s", URLEncoder.encode(url, StandardCharsets.UTF_8.toString()));
@@ -146,7 +152,7 @@ public class CardServiceImpl implements CardService {
 
         String videoId = videoDetail.getVideoId();
         String uid = videoDetail.getUid();
-        JSONObject jsonObject = createGzhPath(videoId, uid, planAccount.getGhId(), planAccount.getMiniprogramUseType());
+        JSONObject jsonObject = createGzhPath(videoId, uid, planAccount.getGhId(), planAccount.getMiniprogramUseType(), index);
 
         PublishMiniprogram publishMiniprogram = new PublishMiniprogram();
         publishMiniprogram.setContentId(publishContent.getId());

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/utils/other/OSSUploader.java

@@ -37,7 +37,7 @@ public class OSSUploader {
     }
 
     public static void main(String[] args) {
-        String s = "/Users/shimeng/Desktop/img/20250619-201325.jpeg";
+        String s = "/Users/shimeng/Desktop/20250912-203708.jpeg";
         String type = "image";
         System.out.println(uploadToOSS(s, type));
     }