From 52f9880445f88ab3cc12a9f48b6d04939bd61fbf Mon Sep 17 00:00:00 2001
From: ZhouYixun <291028775@qq.com>
Date: Sat, 12 Nov 2022 22:39:47 +0800
Subject: [PATCH] fix: update depend version

---
 .../bridge/android/AndroidSupplyTool.java      | 18 +++++++++++++++++-
 .../cloud/sonic/agent/bridge/ios/SibTool.java  |  2 +-
 .../org/cloud/sonic/agent/tools/SGMTool.java   |  2 +-
 src/main/resources/application.yml             |  2 +-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/cloud/sonic/agent/bridge/android/AndroidSupplyTool.java b/src/main/java/org/cloud/sonic/agent/bridge/android/AndroidSupplyTool.java
index 201290e4..0d67a5a8 100755
--- a/src/main/java/org/cloud/sonic/agent/bridge/android/AndroidSupplyTool.java
+++ b/src/main/java/org/cloud/sonic/agent/bridge/android/AndroidSupplyTool.java
@@ -1,3 +1,19 @@
+/*
+ *  Copyright (C) [SonicCloudOrg] Sonic Project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 package org.cloud.sonic.agent.bridge.android;
 
 import com.alibaba.fastjson.JSONObject;
@@ -29,7 +45,7 @@ public static void startShare(String udId, Session session) {
             sasJSON.put("isEnable", true);
             List<String> ver = ProcessCommandTool.getProcessLocalCommand(String.format("%s version", sas));
             if (ver.size() == 0 || !BytesTool.versionCheck(sasVersion, ver.get(0))) {
-                log.info(String.format("Start sonic-android-supply failed! Please use [chmod -R 777 %s], if still failed, you can try with [sudo]", new File("plugins").getAbsolutePath()));
+                log.info(String.format("Start sonic-android-supply failed! Please check sonic-android-supply version or use [chmod -R 777 %s], if still failed, you can try with [sudo]", new File("plugins").getAbsolutePath()));
                 sasJSON.put("port", 0);
                 BytesTool.sendText(session, sasJSON.toJSONString());
                 return;
diff --git a/src/main/java/org/cloud/sonic/agent/bridge/ios/SibTool.java b/src/main/java/org/cloud/sonic/agent/bridge/ios/SibTool.java
index 8c7c6704..81eff2e1 100755
--- a/src/main/java/org/cloud/sonic/agent/bridge/ios/SibTool.java
+++ b/src/main/java/org/cloud/sonic/agent/bridge/ios/SibTool.java
@@ -91,7 +91,7 @@ public void init() {
         restTemplate = restTemplateBean;
         List<String> ver = ProcessCommandTool.getProcessLocalCommand(String.format("%s version", sib));
         if (ver.size() == 0 || !BytesTool.versionCheck(sibVersion, ver.get(0))) {
-            logger.info(String.format("Start sonic-ios-bridge failed! Please use [chmod -R 777 %s], if still failed, you can try with [sudo]", new File("plugins").getAbsolutePath()));
+            logger.info(String.format("Start sonic-ios-bridge failed! Please check sib's version or use [chmod -R 777 %s], if still failed, you can try with [sudo]", new File("plugins").getAbsolutePath()));
             System.exit(0);
         }
         IOSDeviceThreadPool.cachedThreadPool.execute(() -> {
diff --git a/src/main/java/org/cloud/sonic/agent/tools/SGMTool.java b/src/main/java/org/cloud/sonic/agent/tools/SGMTool.java
index 5518232e..4d3f045b 100755
--- a/src/main/java/org/cloud/sonic/agent/tools/SGMTool.java
+++ b/src/main/java/org/cloud/sonic/agent/tools/SGMTool.java
@@ -47,7 +47,7 @@ public static void init() {
         sgmBinary.setReadable(true);
         List<String> ver = ProcessCommandTool.getProcessLocalCommand(String.format("%s -version", sgm));
         if (ver.size() == 0 || !BytesTool.versionCheck(sgmVersion, ver.get(0).replace("sonic-go-mitmproxy:", "").trim())) {
-            logger.info(String.format("Start sonic-go-mitmproxy failed! Please use [chmod -R 777 %s], if still failed, you can try with [sudo]", pFile));
+            logger.info(String.format("Start sonic-go-mitmproxy failed! Please check sonic-go-mitmproxy version or use [chmod -R 777 %s], if still failed, you can try with [sudo]", pFile));
             System.exit(0);
         }
     }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6e73ae2a..8657d1c3 100755
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,7 +9,7 @@ spring:
 sonic:
   saa: 2.0.1
   sgm: 1.3.3
-  sib: 1.2.4
+  sib: 1.2.5
   sas: 0.0.2
   saus: 4.22.1