Merge pull request #115 from SonicCloudOrg/dev

Dev
SonicCloudOrg · Jan 9, 2022 · da37646 · da37646
2 parents 9c6b020 + fe4d271
commit da37646
Show file tree

Hide file tree

Showing 280 changed files with 11,098 additions and 8,380 deletions.
diff --git a/config/jdbc-dev.yml b/config/jdbc-dev.yml
@@ -4,8 +4,20 @@ spring:
     url: jdbc:mysql://localhost:3306/sonic?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&autoReconnect=true&serverTimezone=GMT%2b8
     username: root
     password: Sonic!@#123
-  jpa:
-    open-in-view: true
-    hibernate:
-      ddl-auto: update
-    show-sql: true
+    # 会用到广播的事件
+    initialization-mode: always
+    schema:
+      - classpath:data.sql
+# mybatis-plus配置
+mybatis-plus:
+  mapper-locations: classpath:mapping/*.xml, classpath*:com/gitee/sunchenbin/mybatis/actable/mapping/*/*.xml
+  global-config:
+    # 是否显示mybatis-plus图标
+    banner: false
+  configuration:
+    # 关闭二级缓存
+    cache-enabled: false
+    # 关闭一级缓存
+    localCacheScope: STATEMENT
+    # sql日志
+    # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
diff --git a/config/sonic-server-folder-dev.yml b/config/sonic-server-folder-dev.yml
@@ -2,6 +2,13 @@ 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/recordFiles,/keepFiles/,/imageFiles/,/recordFiles/,/logFiles/,/packageFiles/
+  white-list: /users/login,/users/register,/swagger-resources,/v2/api-docs,/folder/upload,/folder/upload/recordFiles,/folder/upload/cv,/keepFiles/,/imageFiles/,/recordFiles/,/logFiles/,/packageFiles/
 
 spring:
   cloud:

diff --git a/config/sonic-server-task-dev.yml b/config/sonic-server-task-dev.yml
@@ -1,9 +1,5 @@
 server:
   port: 0
-
-spring:
-  datasource:
-    initialization-mode: always
   quartz:
     properties:
       org:

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.2.0-release"
+    image: "sonicorg/sonic-server-eureka:v1.3.0-beta2"
     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.2.0-release"
+    image: "sonicorg/sonic-server-bus:v1.3.0-beta2"
     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.2.0-release"
+    image: "sonicorg/sonic-server-gateway:v1.3.0-beta2"
     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-beta1"
+    image: "sonicorg/sonic-server-controller:v1.3.0-beta2"
     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.2.0-release"
+    image: "sonicorg/sonic-server-folder:v1.3.0-beta2"
     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.2.0-release"
+    image: "sonicorg/sonic-server-task:v1.3.0-beta2"
     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-beta1"
+    image: "sonicorg/sonic-server-transport:v1.3.0-beta2"
     environment:
       - PROFILE=prod
       - EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.sonic</groupId>
+    <groupId>org.cloud.sonic</groupId>
     <artifactId>sonic-server</artifactId>
     <version>1.0.0</version>
     <packaging>pom</packaging>

diff --git a/sonic-server-bus/pom.xml b/sonic-server-bus/pom.xml
@@ -4,13 +4,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>sonic-server</artifactId>
-        <groupId>com.sonic</groupId>
+        <groupId>org.cloud.sonic</groupId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sonic-server-bus</artifactId>
-    <version>v1.2.0-release</version>
+    <version>v1.3.0-beta2</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/...in/java/com/sonic/bus/BusApplication.java → ...a/org/cloud/sonic/bus/BusApplication.java b/...in/java/com/sonic/bus/BusApplication.java → ...a/org/cloud/sonic/bus/BusApplication.java
@@ -1,15 +1,15 @@
-package com.sonic.bus;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.config.server.EnableConfigServer;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
-
-@SpringBootApplication
-@EnableEurekaClient
-@EnableConfigServer
-public class BusApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(BusApplication.class, args);
-    }
+package org.cloud.sonic.bus;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.config.server.EnableConfigServer;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+
+@SpringBootApplication
+@EnableEurekaClient
+@EnableConfigServer
+public class BusApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(BusApplication.class, args);
+    }
 }
diff --git a/sonic-server-common/pom.xml b/sonic-server-common/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>sonic-server</artifactId>
-        <groupId>com.sonic</groupId>
+        <groupId>org.cloud.sonic</groupId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -47,6 +47,12 @@
             <artifactId>java-jwt</artifactId>
             <version>3.10.3</version>
         </dependency>
+        <!-- lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.20</version>
+        </dependency>
     </dependencies>
 
     <!-- 打包构建配置  -->

diff --git a/sonic-server-common/src/main/java/com/sonic/common/exception/SonicException.java b/sonic-server-common/src/main/java/com/sonic/common/exception/SonicException.java
-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/recordFiles,/keepFiles/,/imageFiles/,/recordFiles/,/logFiles/,/packageFiles/
+      white-list: /users/login,/users/register,/swagger-resources,/v2/api-docs,/folder/upload,/folder/upload/recordFiles,/folder/upload/cv,/keepFiles/,/imageFiles/,/recordFiles/,/logFiles/,/packageFiles/
     spring:
       cloud:
@@ Expand Down @@