Merge branch 'mj' into dev

# Conflicts:
#	netflix-web/src/main/resources/application-prd.yml

netflix-web/src/main/java/com/cyksj/web/controller/mirror/MirrorController.java

@@ -317,6 +317,6 @@ public class MirrorController {
         cookie.setDomain(midjourneyHost);
         cookie.setPath("/");
         response.addCookie(cookie);
-        response.sendRedirect(midjourneyHost+"/draw/web/");
+        response.sendRedirect("https://"+midjourneyHost+"/draw/web/");
     }
 }

netflix-web/src/main/resources/application-pre.yml

@@ -196,4 +196,4 @@ smsVerify:
   shoppingApikey: 72d4ff765b6c962f35c9a4125100680d
 
 midjourney:
-  url: https://nf.video
+  url: nf.video