Skip to content

Commit

Permalink
fix: update depend version
Browse files Browse the repository at this point in the history
  • Loading branch information
ZhouYixun committed Nov 12, 2022
1 parent dedc7c7 commit 52f9880
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(() -> {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/cloud/sonic/agent/tools/SGMTool.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 52f9880

Please sign in to comment.