removecv

SonicCloudOrg · Jan 19, 2022 · 31e6135 · 31e6135
1 parent 2a2fd19
commit 31e6135
Show file tree

Hide file tree

Showing 20 changed files with 142 additions and 981 deletions.
diff --git a/config/sonic-server-folder-dev.yml b/config/sonic-server-folder-dev.yml
@@ -2,13 +2,6 @@ server:
   port: 0
 
 spring:
-  tomcat:
-    max-http-post-size: 100M
-  http:
-    multipart:
-      maxFileSize: 3000M
-      maxRequestSize: 3000M
-      maxPostSize: 3000M
   servlet:
     multipart:
       maxFileSize: -1

diff --git a/config/sonic-server-gateway-dev.yml b/config/sonic-server-gateway-dev.yml
@@ -2,7 +2,7 @@ server:
   port: 8094
 
 filter:
-  white-list: /users/login,/users/register,/swagger-resources,/v2/api-docs,/folder/upload,/folder/upload/recordFiles,/folder/upload/cv,/keepFiles/,/imageFiles/,/recordFiles/,/logFiles/,/packageFiles/
+  white-list: /users/login,/users/register,/swagger-resources,/v2/api-docs,/folder/upload,/folder/upload/recordFiles,/keepFiles/,/imageFiles/,/recordFiles/,/logFiles/,/packageFiles/
 
 spring:
   cloud:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   sonic-server-eureka:
-    image: "sonicorg/sonic-server-eureka:v1.3.0-beta2"
+    image: "sonicorg/sonic-server-eureka:v1.3.0-release"
     hostname: sonic-server-eureka
     environment:
       - EUREKA_HOST=sonic-server-eureka
@@ -12,7 +12,7 @@ services:
     ports:
       - "9090:9090"
   sonic-server-bus:
-    image: "sonicorg/sonic-server-bus:v1.3.0-beta2"
+    image: "sonicorg/sonic-server-bus:v1.3.0-release"
     environment:
       - PROFILE=prod
       - EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/
@@ -24,7 +24,7 @@ services:
     depends_on:
       - sonic-server-eureka
   sonic-server-gateway:
-    image: "sonicorg/sonic-server-gateway:v1.3.0-beta2"
+    image: "sonicorg/sonic-server-gateway:v1.3.0-release"
     environment:
       - PROFILE=prod
       - EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/
@@ -38,7 +38,7 @@ services:
     ports:
       - "8094:8094"
   sonic-server-controller:
-    image: "sonicorg/sonic-server-controller:v1.3.0-beta2"
+    image: "sonicorg/sonic-server-controller:v1.3.0-release"
     environment:
       - PROFILE=prod
       - EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/
@@ -51,7 +51,7 @@ services:
       - sonic-server-eureka
       - sonic-server-gateway
   sonic-server-folder:
-    image: "sonicorg/sonic-server-folder:v1.3.0-beta2"
+    image: "sonicorg/sonic-server-folder:v1.3.0-release"
     environment:
       - PROFILE=prod
       - EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/
@@ -68,7 +68,7 @@ services:
       - sonic-server-eureka
       - sonic-server-gateway
   sonic-server-task:
-    image: "sonicorg/sonic-server-task:v1.3.0-beta2"
+    image: "sonicorg/sonic-server-task:v1.3.0-release"
     environment:
       - PROFILE=prod
       - EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/
@@ -81,7 +81,7 @@ services:
       - sonic-server-eureka
       - sonic-server-gateway
   sonic-server-transport:
-    image: "sonicorg/sonic-server-transport:v1.3.0-beta2"
+    image: "sonicorg/sonic-server-transport:v1.3.0-release"
     environment:
       - PROFILE=prod
       - EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/

diff --git a/sonic-server-bus/pom.xml b/sonic-server-bus/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sonic-server-bus</artifactId>
-    <version>v1.3.0-beta2</version>
+    <version>v1.3.0-release</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -42,23 +42,23 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <!--   只作为公共依赖，不需要打包         -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <configuration>
-                    <skipDocker>true</skipDocker>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+<!--    <build>-->
+<!--        <plugins>-->
+<!--            &lt;!&ndash;   只作为公共依赖，不需要打包         &ndash;&gt;-->
+<!--            <plugin>-->
+<!--                <groupId>org.springframework.boot</groupId>-->
+<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    <skip>true</skip>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
+<!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>docker-maven-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    <skipDocker>true</skipDocker>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
+<!--        </plugins>-->
+<!--    </build>-->
 </project>
diff --git a/sonic-server-common/pom.xml b/sonic-server-common/pom.xml
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.41</version>
+            <version>1.2.79</version>
         </dependency>
         <!-- AOP框架 -->
         <dependency>

diff --git a/sonic-server-controller/pom.xml b/sonic-server-controller/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sonic-server-controller</artifactId>
-    <version>v1.3.0-beta2</version>
+    <version>v1.3.0-release</version>
     <packaging>jar</packaging>
 
     <!-- 依赖列表   -->
@@ -94,24 +94,24 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <!--   只作为公共依赖，不需要打包         -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <configuration>
-                    <skipDocker>true</skipDocker>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+<!--    <build>-->
+<!--        <plugins>-->
+<!--            &lt;!&ndash;   只作为公共依赖，不需要打包         &ndash;&gt;-->
+<!--            <plugin>-->
+<!--                <groupId>org.springframework.boot</groupId>-->
+<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    <skip>true</skip>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
+<!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>docker-maven-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    <skipDocker>true</skipDocker>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
+<!--        </plugins>-->
+<!--    </build>-->
 
 </project>
diff --git a/sonic-server-eureka/pom.xml b/sonic-server-eureka/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sonic-server-eureka</artifactId>
-    <version>v1.3.0-beta2</version>
+    <version>v1.3.0-release</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -38,23 +38,23 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <!--   只作为公共依赖，不需要打包         -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <configuration>
-                    <skipDocker>true</skipDocker>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+<!--    <build>-->
+<!--        <plugins>-->
+<!--            &lt;!&ndash;   只作为公共依赖，不需要打包         &ndash;&gt;-->
+<!--            <plugin>-->
+<!--                <groupId>org.springframework.boot</groupId>-->
+<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    <skip>true</skip>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
+<!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>docker-maven-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    <skipDocker>true</skipDocker>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
+<!--        </plugins>-->
+<!--    </build>-->
 </project>
diff --git a/sonic-server-folder/pom.xml b/sonic-server-folder/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sonic-server-folder</artifactId>
-    <version>v1.3.0-beta2</version>
+    <version>v1.3.0-release</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -30,59 +30,25 @@
             <artifactId>sonic-server-common</artifactId>
             <version>1.1.0</version>
         </dependency>
-        <!--    视频处理与图像处理    -->
-        <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>javacv</artifactId>
-            <version>1.5.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>openblas</artifactId>
-            <version>0.3.9-1.5.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>opencv</artifactId>
-            <version>4.3.0-1.5.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>javacpp</artifactId>
-            <version>1.5.3</version>
-            <classifier>linux-x86_64</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>opencv</artifactId>
-            <version>4.3.0-1.5.3</version>
-            <classifier>linux-x86_64</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>openblas</artifactId>
-            <version>0.3.9-1.5.3</version>
-            <classifier>linux-x86_64</classifier>
-        </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <!--   只作为公共依赖，不需要打包         -->
+<!--    <build>-->
+<!--        <plugins>-->
+<!--            &lt;!&ndash;   只作为公共依赖，不需要打包         &ndash;&gt;-->
 <!--            <plugin>-->
 <!--                <groupId>org.springframework.boot</groupId>-->
 <!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
 <!--                <configuration>-->
 <!--                    <skip>true</skip>-->
 <!--                </configuration>-->
 <!--            </plugin>-->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <configuration>
-                    <skipDocker>true</skipDocker>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+<!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>docker-maven-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    <skipDocker>true</skipDocker>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
+<!--        </plugins>-->
+<!--    </build>-->
 </project>
diff --git a/sonic-server-folder/src/main/docker/sonic-server-folder.jar b/sonic-server-folder/src/main/docker/sonic-server-folder.jar
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ server: @@
       port: 8094
     filter:
-      white-list: /users/login,/users/register,/swagger-resources,/v2/api-docs,/folder/upload,/folder/upload/recordFiles,/folder/upload/cv,/keepFiles/,/imageFiles/,/recordFiles/,/logFiles/,/packageFiles/
+      white-list: /users/login,/users/register,/swagger-resources,/v2/api-docs,/folder/upload,/folder/upload/recordFiles,/keepFiles/,/imageFiles/,/recordFiles/,/logFiles/,/packageFiles/
     spring:
       cloud:
@@ Expand Down @@