fix: add release mode

SonicCloudOrg · Dec 13, 2022 · 35c2366 · 35c2366
1 parent 3ad60d5
commit 35c2366
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -52,7 +52,7 @@ jobs:
       - name: sib
         run: tar zxvf *_linux_x86_64.tar.gz && rm *_linux_x86_64.tar.gz && mv sib plugins/sonic-ios-bridge
       - name: deploy
-        run: mvn package -Dplatform=linux-x86_64 -Dmaven.test.skip=true
+        run: mvn package -Dplatform=linux-x86_64 -DreleaseMode=true -Dmaven.test.skip=true
       - name: build image
         run: docker build -t sonicorg/sonic-agent-linux:${{ steps.previoustag.outputs.tag }} -f src/main/docker/Dockerfile .
       - name: push

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -83,7 +83,7 @@ jobs:
       - name: mkdir
         run: mkdir -p sonic-agent-${{ steps.previoustag.outputs.tag }}-${{matrix.depend}}/plugins
       - name: package
-        run: mvn clean package -Dplatform=${{ matrix.platform }} -Dmaven.test.skip=true
+        run: mvn clean package -Dplatform=${{ matrix.platform }} -DreleaseMode=true -Dmaven.test.skip=true
       - name: mvJar-linux86
         run: cp -r target/sonic-agent-${{ matrix.platform }}.jar sonic-agent-${{ steps.previoustag.outputs.tag }}-${{matrix.depend}}/
       - name: copy

diff --git a/pom.xml b/pom.xml
@@ -12,6 +12,7 @@
     <properties>
         <!--        [ "windows-x86", "windows-x86_64", "macosx-arm64", "macosx-x86_64", "linux-arm64", "linux-x86", "linux-x86_64" ]-->
         <platform>windows-x86_64</platform>
+        <releaseMode>false</releaseMode>
         <maven.compiler.source>15</maven.compiler.source>
         <maven.compiler.target>15</maven.compiler.target>
     </properties>

diff --git a/src/main/java/org/cloud/sonic/agent/tools/file/UploadTools.java b/src/main/java/org/cloud/sonic/agent/tools/file/UploadTools.java
@@ -49,14 +49,17 @@ public class UploadTools {
     private String host;
     @Value("${sonic.server.port}")
     private String port;
+
+    @Value("${sonic.release-mode}")
+    private Boolean isRelease;
     private static String baseUrl;
 
     private static RestTemplate restTemplate;
 
     @Autowired
     public void setRestTemplate(RestTemplate restTemplate) {
         UploadTools.restTemplate = restTemplate;
-        baseUrl = "http://" + host + ":" + port + "/server/api/folder".replace(":80/", "/");
+        baseUrl = "http://" + host + ":" + port + (isRelease ? "/server" : "") + "/api/folder".replace(":80/", "/");
     }
 
     public static String upload(File uploadFile, String type) {

diff --git a/src/main/java/org/cloud/sonic/agent/transport/TransportConnectionThread.java b/src/main/java/org/cloud/sonic/agent/transport/TransportConnectionThread.java
@@ -43,16 +43,17 @@ public class TransportConnectionThread implements Runnable {
     Integer serverPort = Integer.valueOf(SpringTool.getPropertiesValue("sonic.server.port"));
     String key = String.valueOf(SpringTool.getPropertiesValue("sonic.agent.key"));
 
+    boolean isRelease = Boolean.valueOf(SpringTool.getPropertiesValue("sonic.release-mode"));
+
     @Override
     public void run() {
         Thread.currentThread().setName(THREAD_NAME);
         if (TransportWorker.client == null) {
             if (!TransportWorker.isKeyAuth) {
                 return;
             }
-            //开发环境去掉/server
-            String url = String.format("ws://%s:%d/server/websockets/agent/%s",
-                    serverHost, serverPort, key).replace(":80/", "/");
+            String url = String.format("ws://%s:%d%s/websockets/agent/%s",
+                    serverHost, serverPort, isRelease ? "/server" : "", key).replace(":80/", "/");
             URI uri = URI.create(url);
             TransportClient transportClient = new TransportClient(uri);
             transportClient.connect();

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -12,6 +12,7 @@ sonic:
   sib: 1.3.3
   sas: 0.0.2
   saus: 5.7.4
+  release-mode: @project.properties.releaseMode@
 
 logging:
   file: