Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

base-servers/account/account-server/src/main/resources/config/application-docker-prod.yml

@@ -0,0 +1,7 @@
+eureka:
+  instance:
+    hostname: smartschool-account-server
+    prefer-ip-address: false
+  client:
+    serviceUrl:
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@smartschool-eureka-server:9500/eureka/

base-servers/auth/auth-server/src/main/resources/application.yml

@@ -78,7 +78,7 @@ info:
   spring-boot-version: '@spring.boot.version@'
   spring-cloud-version: '@spring.cloud.version@'
 mybatis:
-  type-aliases-package: com.usoftchina.saas.auth.po
+  type-aliases-package: com.usoftchina.smartschool.auth.po
   mapper-locations: classpath:mapper/*.xml
 auth:
   private-key: auth/pri.key

base-servers/auth/auth-server/src/main/resources/config/application-docker-prod.yml

@@ -0,0 +1,7 @@
+eureka:
+  instance:
+    hostname: smartschool-auth-server
+    prefer-ip-address: false
+  client:
+    serviceUrl:
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@smartschool-eureka-server:9500/eureka/