Merge remote-tracking branch 'origin/local-ss' into local-ss

# Conflicts:
#	server/src/main/java/io/wdd/rpc/init/AcceptAgentInitInfo.java

server/src/main/java/io/wdd/rpc/init/AcceptAgentInitInfo.java

@@ -62,6 +62,11 @@ public class AcceptAgentInitInfo {
                 12);
         put("Xiamen",
                 13);
+        put("Shenzhen",
+                14);
+
+        put("Local",
+                15);
         put("Guangzhou",
                 13);
 
@@ -248,8 +253,14 @@ public class AcceptAgentInitInfo {
                 " ",
                 ""
         );
+        if (serverName.startsWith("-")) {
+            // empty city situation
+            serverName = "Local" + serverName;
+        }
+
         serverInfoVO.setServerName(serverName);
 
+
         // validate serverName
         String[] split = serverName.split("-");
         if (split.length <= 2 || !ALL_SERVER_CITY_INDEX.containsKey(split[0]) || !ALL_SERVER_ARCH_INFO.contains(split[1])) {

server/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
     allow-circular-references: true
     allow-bean-definition-overriding: true
   rabbitmq:
-    host: 42.192.52.227
+    host: 172.28.0.10
     port: 20672
     username: boge
     password: boge8tingH
@@ -24,7 +24,7 @@ spring:
           max-interval: 65000
           initial-interval: 2000
   redis:
-    host: 42.192.52.227
+    host: 172.28.0.10
     port: 21370
     database: 0
     password: boge8tingH
@@ -46,7 +46,7 @@ spring:
 
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://42.192.52.227:21306/octopus_server?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
+    url: jdbc:mysql://172.28.0.10:21306/octopus_server?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
     username: boge
     password: boge8tingH
     type: com.zaxxer.hikari.HikariDataSource