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

src/main/java/com/fdkankan/ucenter/common/utils/ShellUtil.java

@@ -57,7 +57,7 @@ public class ShellUtil {
                 String line = null;
                 try {
                     while((line = in.readLine()) != null) {
-                       log.debug("output: " + line);
+                       log.info("output: " + line);
                     }
                 }
                 catch (IOException e) {
@@ -80,7 +80,7 @@ public class ShellUtil {
                 String line = null;
                 try {
                     while((line = err.readLine()) != null) {
-                        log.debug("err: " + line);
+                        log.info("err: " + line);
                     }
                 }
                 catch (IOException e) {

src/main/java/com/fdkankan/ucenter/controller/AuthLicenseController.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.ucenter.common.ResultData;
 import com.fdkankan.ucenter.common.utils.AuthLicenseUtil;
 import com.fdkankan.ucenter.util.DateUserUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,19 +28,33 @@ import java.util.Date;
  * @since 2022-11-22
  */
 @RestController
+@Slf4j
 @RequestMapping("/ucenter/authLicense")
 public class AuthLicenseController {
 
 
     @GetMapping("/getAuthInfo")
     public ResultData getAuthInfo(){
-        JSONObject jsonObject = AuthLicenseUtil.readLicense();
-        JSONObject licenseInfo = jsonObject.getJSONObject("licenseInfo");
-        JSONObject snInfo = licenseInfo.getJSONObject("snInfo");
-        String endDate = snInfo.getStr("endDate");
-        Date date = DateUserUtil.getDate(endDate);
-        Long days = DateUserUtil.between(date,new Date());
-        snInfo.set("expirationDays",days);
+        JSONObject jsonObject = null;
+        try {
+            jsonObject = AuthLicenseUtil.readLicense();
+            JSONObject licenseInfo = jsonObject.getJSONObject("licenseInfo");
+            JSONObject snInfo = licenseInfo.getJSONObject("snInfo");
+            String endDate = snInfo.getStr("endDate");
+            String sn = snInfo.getStr("sn");
+            Date date = DateUserUtil.getDate(endDate);
+            Long days = DateUserUtil.between(date,new Date());
+            snInfo.set("expirationDays",days);
+            if(StringUtils.isNotBlank(sn)){
+                String snPassWord = "***";
+                if(sn.length() > 6){
+                    snPassWord = sn.substring(0, 3) + "******" + sn.substring(sn.length()-3, sn.length());
+                }
+                snInfo.set("sn", snPassWord);
+            }
+        }catch (Exception e){
+            log.error("authLicense-getAuthInfo-error:",e);
+        }
         return ResultData.ok(jsonObject);
     }
 

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -834,7 +834,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         String data = FileUtils.readFile(newDataSource + "/data.fdage");
         JSONObject jsonObject = JSONObject.parseObject(data);
         if(ObjectUtils.isEmpty(jsonObject)){
-            log.error("data.fdage文件不存在");
+            log.error("复制场景失败data.fdage文件不存在:oldDataSource:{},newDataSource:{}",oldDataSource,newDataSource);
             throw new BusinessException(-1,"拷贝场景出错，data.fdage文件不存在");
         }
         jsonObject.put("uuidtime",time);