Selaa lähdekoodia

api去除servicefeign配置

guq 6 vuotta sitten
vanhempi
commit
be2e2d6620

+ 0 - 4
base-servers/account/account-api/pom.xml

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

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

@@ -4,7 +4,6 @@ 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;
@@ -15,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
  * @author yingp
  * @date 2018/10/6
  */
-@FeignClient(name = "account-server", configuration = ServiceFeignInterceptor.class)
+@FeignClient(name = "account-server")
 public interface AccountApi {
     /**
      * 校验用户和密码

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

@@ -4,7 +4,6 @@ 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.*;
@@ -15,7 +14,7 @@ import java.util.List;
  * @author yingp
  * @date 2018/11/15
  */
-@FeignClient(name = "account-server", configuration = ServiceFeignInterceptor.class)
+@FeignClient(name = "account-server")
 public interface CompanyApi {
 
     /**

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

@@ -1,7 +1,6 @@
 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;
@@ -13,7 +12,7 @@ import java.util.List;
  * @author yingp
  * @date 2018/11/1
  */
-@FeignClient(name = "account-server", configuration = ServiceFeignInterceptor.class)
+@FeignClient(name = "account-server")
 public interface ResourceApi {
 
     /**

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

@@ -179,6 +179,7 @@ public class AccountController {
      * @return
      */
     @PostMapping("/update")
+    @IgnoreAuth
     public Result update(@RequestBody AccountUpdateDTO accountUpdateDTO) {
         Account account = BeanMapper.map(accountUpdateDTO, Account.class);
         accountService.updateByPrimaryKeySelective(account);
@@ -536,6 +537,7 @@ public class AccountController {
     * @Date: 2019/1/4
     */
     @PostMapping("/updatePassword")
+    @IgnoreAuth
     Result updatePassword(@RequestBody CookieInfo info) {
         accountService.updatePassword(info);
         return Result.success();

+ 2 - 0
base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/controller/ResourceController.java

@@ -4,6 +4,7 @@ import com.usoftchina.saas.account.cache.ResourceCache;
 import com.usoftchina.saas.account.dto.ResourceModuleDTO;
 import com.usoftchina.saas.account.dto.UrlResourceDTO;
 import com.usoftchina.saas.account.service.ResourceService;
+import com.usoftchina.saas.auth.client.annotation.IgnoreAuth;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.utils.StringUtils;
@@ -46,6 +47,7 @@ public class ResourceController {
      * @return
      */
     @GetMapping("/url/list")
+    @IgnoreAuth
     public Result<List<UrlResourceDTO>> getUrlResourcesByAppId(String appId) {
         if (StringUtils.isEmpty(appId)) {
             // 查找当前登录应用的全部资源

+ 0 - 2
base-servers/auth/auth-server/src/main/java/com/usoftchina/saas/auth/controller/AuthController.java

@@ -5,7 +5,6 @@ import com.usoftchina.saas.account.api.AccountApi;
 import com.usoftchina.saas.account.api.CompanyApi;
 import com.usoftchina.saas.account.constant.AccountType;
 import com.usoftchina.saas.account.dto.*;
-import com.usoftchina.saas.auth.client.annotation.IgnoreAuth;
 import com.usoftchina.saas.auth.common.constant.AuthConstants;
 import com.usoftchina.saas.auth.common.cookie.CookieHelper;
 import com.usoftchina.saas.auth.common.cookie.CookieInfo;
@@ -51,7 +50,6 @@ import java.util.List;
 @RestController
 @RequestMapping
 @EnableConfigurationProperties(CookieConfig.class)
-@IgnoreAuth
 public class AuthController {
 
     @Autowired