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

applications/document/document-server/src/main/resources/application.yml

@@ -77,6 +77,8 @@ auth:
 ribbon:
   ReadTimeout: 10000
   ConnectTimeout: 10000
+  eager-load:
+    enabled: true
 feign:
   hystrix:
     enabled: true
@@ -90,7 +92,7 @@ hystrix:
                 enabled: true
               isolation:
                     thread:
-                        timeoutInMilliseconds: 4000
+                        timeoutInMilliseconds: 5000
 b2b:
   baseUrl:
     inquiry: https://test-inquiry.uuzcc.cn

applications/purchase/purchase-server/src/main/resources/application.yml

@@ -77,6 +77,8 @@ auth:
 ribbon:
   ReadTimeout: 10000
   ConnectTimeout: 10000
+  eager-load:
+    enabled: true
 feign:
   hystrix:
     enabled: true
@@ -88,7 +90,7 @@ hystrix:
                 enabled: true
               isolation:
                     thread:
-                        timeoutInMilliseconds: 4000
+                        timeoutInMilliseconds: 5000
 b2b:
   baseUrl:
     inquiry: https://test-inquiry.uuzcc.cn

applications/sale/sale-server/src/main/resources/application.yml

@@ -77,6 +77,8 @@ auth:
 ribbon:
   ReadTimeout: 10000
   ConnectTimeout: 10000
+  eager-load:
+    enabled: true
 feign:
   hystrix:
     enabled: true
@@ -88,7 +90,7 @@ hystrix:
                 enabled: true
               isolation:
                     thread:
-                        timeoutInMilliseconds: 4000
+                        timeoutInMilliseconds: 5000
 b2b:
   baseUrl:
     inquiry: https://test-inquiry.uuzcc.cn

base-servers/account/account-api/pom.xml

@@ -33,6 +33,10 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>auth-common</artifactId>
         </dependency>
+      <dependency>
+        <groupId>com.usoftchina.saas</groupId>
+        <artifactId>auth-client</artifactId>
+      </dependency>
     </dependencies>
 
 </project>

base-servers/account/account-api/src/main/java/com/usoftchina/saas/account/api/AccountApi.java

@@ -4,6 +4,7 @@ import com.usoftchina.saas.account.dto.AccountCopyDTO;
 import com.usoftchina.saas.account.dto.AccountDTO;
 import com.usoftchina.saas.account.dto.AccountRegDTO;
 import com.usoftchina.saas.account.dto.AccountUpdateDTO;
+import com.usoftchina.saas.auth.client.interceptor.ServiceFeignInterceptor;
 import com.usoftchina.saas.auth.common.cookie.CookieInfo;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.ShareAddDTO;
@@ -14,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
  * @author yingp
  * @date 2018/10/6
  */
-@FeignClient(name = "account-server")
+@FeignClient(name = "account-server", configuration = ServiceFeignInterceptor.class)
 public interface AccountApi {
     /**
      * 校验用户和密码

base-servers/account/account-api/src/main/java/com/usoftchina/saas/account/api/CompanyApi.java

@@ -4,6 +4,7 @@ import com.usoftchina.saas.account.dto.CompanyCopyDTO;
 import com.usoftchina.saas.account.dto.CompanyDTO;
 import com.usoftchina.saas.account.dto.CompanyRegDTO;
 import com.usoftchina.saas.account.dto.CompanyRspDTO;
+import com.usoftchina.saas.auth.client.interceptor.ServiceFeignInterceptor;
 import com.usoftchina.saas.base.Result;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -14,7 +15,7 @@ import java.util.List;
  * @author yingp
  * @date 2018/11/15
  */
-@FeignClient(name = "account-server")
+@FeignClient(name = "account-server", configuration = ServiceFeignInterceptor.class)
 public interface CompanyApi {
 
     /**

base-servers/account/account-api/src/main/java/com/usoftchina/saas/account/api/ResourceApi.java

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.account.api;
 
 import com.usoftchina.saas.account.dto.UrlResourceDTO;
+import com.usoftchina.saas.auth.client.interceptor.ServiceFeignInterceptor;
 import com.usoftchina.saas.base.Result;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -12,7 +13,7 @@ import java.util.List;
  * @author yingp
  * @date 2018/11/1
  */
-@FeignClient(name = "account-server")
+@FeignClient(name = "account-server", configuration = ServiceFeignInterceptor.class)
 public interface ResourceApi {
 
     /**

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/controller/AccountController.java

@@ -295,6 +295,7 @@ public class AccountController {
      * @return
      */
     @GetMapping(value = "/read", params = "username")
+    @IgnoreAuth
     public Result<AccountDTO> getAccount(@RequestParam(value = "username") String username) {
         Account account = getAccountByUsername(username);
         if (null == account) {
@@ -311,6 +312,7 @@ public class AccountController {
      * @return
      */
     @GetMapping(value = "/read", params = "uu")
+    @IgnoreAuth
     public Result<AccountDTO> getAccountByUu(@RequestParam(value = "uu") Long uu) {
         Account account = accountService.findByUu(uu);
         if (null == account) {
@@ -342,6 +344,7 @@ public class AccountController {
      * @return
      */
     @GetMapping("/read/{id}")
+    @IgnoreAuth
     public Result<AccountDTO> getAccountById(@PathVariable Long id) {
         Account account = accountService.findByPrimaryKey(id);
         if (null == account) {