Merge remote-tracking branch 'origin/featrue-local' into featrue-local

src/main/java/com/fdkankan/scene/constant/LaserApiConstant.java

@@ -13,7 +13,7 @@ public class LaserApiConstant {
     /**
      * %s 场景码
      */
-    public static String EDIT_SCENE = "/laser/4dage/editTitleOrThumb/%s";
+    public static String EDIT_SCENE = "/laser/4dage/editScene/%s";
 
 
 }

src/main/java/com/fdkankan/scene/service/impl/LaserServiceImpl.java

@@ -11,6 +11,8 @@ import com.fdkankan.scene.util.forest.HttpClient;
 import com.fdkankan.scene.util.forest.SuccessCallback;
 import java.io.File;
 import javax.annotation.PostConstruct;
+
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,6 +25,7 @@ import org.springframework.stereotype.Service;
  * @since 2022/9/27
  **/
 @Service
+@Slf4j
 public class LaserServiceImpl implements ILaserService {
 
     @Autowired
@@ -44,6 +47,7 @@ public class LaserServiceImpl implements ILaserService {
 
     @Override
     public void editScene(String num, LaserSceneBean sceneBean) {
+        log.info("editScene,{}-{}",num,sceneBean);
         String api = String.format(LaserApiConstant.EDIT_SCENE, num);
         httpClient.postJson(host, port, api, sceneBean, new SuccessCallback(), new ErrorCallback());
     }

src/main/java/com/fdkankan/scene/util/forest/SuccessCondition.java

@@ -42,7 +42,7 @@ public class SuccessCondition implements SuccessWhen {
             return reqStatus;
         }
         ResultData result = JSONUtil.toBean(content, ResultData.class);
-        if(result.getCode() != ServerCode.SUCCESS.code() || result.getCode() != HttpStatus.OK){
+        if(result.getCode() != ServerCode.SUCCESS.code() && result.getCode() != HttpStatus.OK){
             reqStatus = false;
             return reqStatus;
         }

src/main/resources/application-standAloneProd.yml

@@ -65,6 +65,7 @@ spring:
     host: 127.0.0.1
     port: 16379
     timeout: 6000ms
+    password:
     jedis:
       pool:
         max-active: 10  #连接池最大连接数（使用负值表示没有限制）