使用配置

spring5-auth/spring5-auth-server/src/main/java/com/yaozhitech/spring5/config/EnvConfig.java

@@ -0,0 +1,112 @@
+package com.yaozhitech.spring5.config;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.EnvironmentAware;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.core.env.Environment;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 环境配置
+ *
+ * @author shouhua
+ */
+@Slf4j
+@Configuration
+public class EnvConfig implements ApplicationListener<ContextRefreshedEvent>, EnvironmentAware, ApplicationContextAware {
+
+    private static Environment environment;
+
+    private static ApplicationContext applicationContext;
+    private volatile static Boolean ON_LINE;
+
+    /**
+     * 是否线上环境
+     *
+     * @return
+     */
+    public static boolean isOnLine() {
+        if (ON_LINE == null) {
+            ON_LINE = Arrays.asList(environment.getActiveProfiles()).contains(GlobalConstants.SPRING_PROFILE_PRODUCTION);
+        }
+        return ON_LINE;
+    }
+
+    /**
+     * 获取当前环境
+     *
+     * @return
+     */
+    public static String getEnvironment() {
+        if (Arrays.asList(environment.getActiveProfiles()).contains(GlobalConstants.SPRING_PROFILE_PRODUCTION)) {
+            return GlobalConstants.SPRING_PROFILE_PRODUCTION;
+        } else if (Arrays.asList(environment.getActiveProfiles()).contains(GlobalConstants.SPRING_PROFILE_DEVELOPMENT)) {
+            return GlobalConstants.SPRING_PROFILE_DEVELOPMENT;
+        } else if (Arrays.asList(environment.getActiveProfiles()).contains(GlobalConstants.SPRING_PROFILE_TEST)) {
+            return GlobalConstants.SPRING_PROFILE_TEST;
+        } else {
+            return environment.getActiveProfiles().toString();
+        }
+    }
+
+    /**
+     * 获取配置
+     *
+     * @param key
+     * @return
+     */
+    public static String getProperty(String key) {
+        return environment.getProperty(key);
+    }
+
+    /**
+     * 获取配置
+     *
+     * @param key
+     * @param targetType
+     * @param <T>
+     * @return
+     */
+    public static <T> T getProperty(String key, Class<T> targetType) {
+        return environment.getProperty(key, targetType);
+    }
+
+    public static <T> T getBean(Class<T> requiredType) {
+        return EnvConfig.applicationContext.getBean(requiredType);
+    }
+
+    public static <T> Map<String, T> getBeansOfType(Class<T> requiredType) {
+        return EnvConfig.applicationContext.getBeansOfType(requiredType);
+    }
+
+    public static ApplicationContext getApplicationContext() {
+        return EnvConfig.applicationContext;
+    }
+
+    @Override
+    public void onApplicationEvent(ContextRefreshedEvent event) {
+        //刷新环境
+        setApplicationContext(event.getApplicationContext());
+        setEnvironment(EnvConfig.applicationContext.getEnvironment());
+    }
+
+    @Override
+    public void setEnvironment(Environment environment) {
+        EnvConfig.environment = environment;
+        String active = EnvConfig.environment.getProperty("spring.profiles.active");
+        log.warn("激活[{}]配置", active);
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        EnvConfig.applicationContext = applicationContext;
+    }
+}

spring5-auth/spring5-auth-server/src/main/java/com/yaozhitech/spring5/config/ShiroConfiguration.java

@@ -16,6 +16,7 @@ import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
 import org.apache.shiro.spring.web.config.DefaultShiroFilterChainDefinition;
 import org.apache.shiro.spring.web.config.ShiroFilterChainDefinition;
 import org.apache.shiro.web.mgt.DefaultWebSessionStorageEvaluator;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -28,6 +29,9 @@ import com.yaozhitech.spring5.service.UserService;
 
 @Configuration
 public class ShiroConfiguration {
+	
+	@Value("${password.salt}")
+	private String encryptSalt;
 
 	/**
 	 * 注册shiro的Filter，拦截请求
@@ -69,7 +73,7 @@ public class ShiroConfiguration {
     */
     @Bean("dbRealm")
     public Realm dbShiroRealm(UserService userService) {
-        DbShiroRealm myShiroRealm = new DbShiroRealm(userService);
+        DbShiroRealm myShiroRealm = new DbShiroRealm(userService, encryptSalt);
         return myShiroRealm;
     }
 
@@ -119,4 +123,5 @@ public class ShiroConfiguration {
     protected AnyRolesAuthorizationFilter createRolesFilter(){
         return new AnyRolesAuthorizationFilter();
     }
+    
 }

spring5-auth/spring5-auth-server/src/main/java/com/yaozhitech/spring5/jwt/DbShiroRealm.java

@@ -18,15 +18,18 @@ import org.apache.shiro.util.ByteSource;
 import com.yaozhitech.spring5.dto.UserDto;
 import com.yaozhitech.spring5.service.UserService;
 
+
 public class DbShiroRealm extends AuthorizingRealm {
 	
-	private static final String encryptSalt = "F12839WhsnnEV$#23b";
 	private UserService userService;
 	
-	public DbShiroRealm(UserService userService) {
+	private String passwordSalt;
+	
+	public DbShiroRealm(UserService userService, String passwordSalt) {
 		this.userService = userService;
 		//因为数据库中的密码做了散列，所以使用shiro的散列Matcher
 		this.setCredentialsMatcher(new HashedCredentialsMatcher(Sha256Hash.ALGORITHM_NAME));
+		this.passwordSalt = passwordSalt;
 	}
 	
 	/**
@@ -48,7 +51,7 @@ public class DbShiroRealm extends AuthorizingRealm {
 		if(user == null)
 			throw new AuthenticationException("用户名或者密码错误");
 		
-		return new SimpleAuthenticationInfo(user, user.getEncryptPwd(), ByteSource.Util.bytes(encryptSalt), "dbRealm");
+		return new SimpleAuthenticationInfo(user, user.getEncryptPwd(), ByteSource.Util.bytes(passwordSalt), "dbRealm");
 	}
 
 

spring5-auth/spring5-auth-server/src/main/java/com/yaozhitech/spring5/service/UserService.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import org.apache.shiro.crypto.hash.Sha256Hash;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
@@ -14,72 +15,77 @@ import com.yaozhitech.spring5.utils.JwtUtils;
 @Service
 public class UserService {
 
-	private static final String encryptSalt = "F12839WhsnnEV$#23b";
+	@Value("${password.salt}")
+	private String encryptSalt;
 
 	@Autowired
 	private StringRedisTemplate redisTemplate;
-   
-    /**
-          *  保存user登录信息，返回token
-     * @param userDto
-     */
-    public String generateJwtToken(String username) {
-    	String salt = "12345";//JwtUtils.generateSalt();
-    	/**
-    	 * @todo 将salt保存到数据库或者缓存中
-    	 * redisTemplate.opsForValue().set("token:"+username, salt, 3600, TimeUnit.SECONDS);
-    	 */   	
-    	return JwtUtils.sign(username, salt, 3600); //生成jwt token，设置过期时间为1小时
-    }
-    
-    /**
-     * 获取上次token生成时的salt值和登录用户信息
-     * @param username
-     * @return
-     */
-    public UserDto getJwtTokenInfo(String username) {
-    	String salt = "12345";
-    	/**
-    	 * @todo 从数据库或者缓存中取出jwt token生成时用的salt
-    	 * salt = redisTemplate.opsForValue().get("token:"+username);
-    	 */   	
-    	UserDto user = getUserInfo(username);
-    	user.setSalt(salt);
-    	return user;
-    }
 
-    /**
-     * 清除token信息
-     * @param userName 登录用户名
-     * @param terminal 登录终端
-     */
-    public void deleteLoginInfo(String username) {
-    	/**
-    	 * @todo 删除数据库或者缓存中保存的salt
-    	 * redisTemplate.delete("token:"+username);
-    	 */
-    	
-    }
-    
-    /**
-     * 获取数据库中保存的用户信息，主要是加密后的密码
-     * @param userName
-     * @return
-     */
-    public UserDto getUserInfo(String userName) {
-    	UserDto user = new UserDto();
-    	user.setUserId(1L);
-    	user.setUsername("admin");
-    	user.setEncryptPwd(new Sha256Hash("123456", encryptSalt).toHex());
-    	return user;
-    }
-    
-    /**
-     * 获取用户角色列表，强烈建议从缓存中获取
-     * @param userId
-     * @return
-     */
-    public List<String> getUserRoles(Long userId){
-    	return Arrays.asList("admin");
-    }
+	/**
+	 * 保存user登录信息，返回token
+	 * 
+	 * @param userDto
+	 */
+	public String generateJwtToken(String username) {
+		String salt = "12345";// JwtUtils.generateSalt();
+		/**
+		 * @todo 将salt保存到数据库或者缓存中 redisTemplate.opsForValue().set("token:"+username,
+		 *       salt, 3600, TimeUnit.SECONDS);
+		 */
+		return JwtUtils.sign(username, salt, 3600); // 生成jwt token，设置过期时间为1小时
+	}
+
+	/**
+	 * 获取上次token生成时的salt值和登录用户信息
+	 * 
+	 * @param username
+	 * @return
+	 */
+	public UserDto getJwtTokenInfo(String username) {
+		String salt = "12345";
+		/**
+		 * @todo 从数据库或者缓存中取出jwt token生成时用的salt salt =
+		 *       redisTemplate.opsForValue().get("token:"+username);
+		 */
+		UserDto user = getUserInfo(username);
+		user.setSalt(salt);
+		return user;
+	}
+
+	/**
+	 * 清除token信息
+	 * 
+	 * @param userName 登录用户名
+	 * @param terminal 登录终端
+	 */
+	public void deleteLoginInfo(String username) {
+		/**
+		 * @todo 删除数据库或者缓存中保存的salt redisTemplate.delete("token:"+username);
+		 */
+
+	}
+
+	/**
+	 * 获取数据库中保存的用户信息，主要是加密后的密码
+	 * 
+	 * @param userName
+	 * @return
+	 */
+	public UserDto getUserInfo(String userName) {
+		UserDto user = new UserDto();
+		user.setUserId(1L);
+		user.setUsername("admin");
+		user.setEncryptPwd(new Sha256Hash("123456", encryptSalt).toHex());
+		return user;
+	}
+
+	/**
+	 * 获取用户角色列表，强烈建议从缓存中获取
+	 * 
+	 * @param userId
+	 * @return
+	 */
+	public List<String> getUserRoles(Long userId) {
+		return Arrays.asList("admin");
+	}
 }

spring5-auth/spring5-auth-server/src/main/resources/application.yml

@@ -12,4 +12,5 @@ spring:
   thymeleaf:
     cache: false
   
-            
+password:
+  salt: k12829WhsvnEV$#03b2n