yonge 5 lat temu
rodzic
commit
600267ffe3

+ 0 - 40
mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/provider/service/PhoneUserDetailService.java

@@ -1,40 +0,0 @@
-package com.ym.mec.auth.core.provider.service;
-
-import com.ym.mec.auth.api.dto.SysUserInfo;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.auth.service.SysUserService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.LockedException;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.AuthorityUtils;
-import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
-import java.util.List;
-
-@Service
-public class PhoneUserDetailService implements UserDetailsService {
-
-    @Autowired
-    private SysUserService sysUserService;
-
-    @Override
-    public UserDetails loadUserByUsername(String phone) throws UsernameNotFoundException {
-        SysUserInfo userInfo = sysUserService.queryUserInfoByPhone(phone);
-        if(userInfo == null){
-            return null;
-        }else if(StringUtils.equals(userInfo.getSysUser().getLockFlag(),"9")){
-            throw new LockedException("账户被锁定");
-        }
-        List<GrantedAuthority> authorities = AuthorityUtils.createAuthorityList(userInfo.getPermissions());
-
-        SysUser sysUser = userInfo.getSysUser();
-
-        return new User(phone, "", StringUtils.equals(sysUser.getLockFlag(), "0"), true, true, true,
-                authorities);
-    }
-
-}

+ 1 - 1
mec-auth/mec-auth-server/src/main/resources/application.yml

@@ -54,7 +54,7 @@ mybatis:
     mapperLocations: classpath:config/mybatis/*.xml
     
 swagger:
-  base-package: com.ym.mec.auth.controller
+  base-package: com.ym.mec.auth.web.controller
   
 #spring boot admin 相关配置
 management:

+ 2 - 2
mec-auth/mec-auth-server/src/main/resources/bootstrap.properties

@@ -1,9 +1,9 @@
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 #spring.profiles.active=dev
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=localhost:8848
+spring.cloud.nacos.config.server-addr=47.99.212.176:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=40ebb2ed-23ac-4afb-b48f-8d727f332edc
+spring.cloud.nacos.config.namespace=e246d169-227d-4012-8c34-e90e057d95d2
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

+ 2 - 2
mec-gateway/mec-gateway-web/src/main/resources/bootstrap.properties

@@ -1,9 +1,9 @@
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 #spring.profiles.active=dev
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=localhost:8848
+spring.cloud.nacos.config.server-addr=47.99.212.176:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=40ebb2ed-23ac-4afb-b48f-8d727f332edc
+spring.cloud.nacos.config.namespace=e246d169-227d-4012-8c34-e90e057d95d2
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}