Browse Source

更新启动banner

mrbird 6 years ago
parent
commit
2fcf771d8d

+ 3 - 7
febs-auth/src/main/java/cc/mrbird/febs/auth/configure/FebsAuthorizationServerConfigurer.java

@@ -40,10 +40,6 @@ public class FebsAuthorizationServerConfigurer extends AuthorizationServerConfig
     @Autowired
     private FebsWebResponseExceptionTranslator exceptionTranslator;
     @Autowired
-    private TokenStore jwtTokenStore;
-    @Autowired
-    private JwtAccessTokenConverter jwtAccessTokenConverter;
-    @Autowired
     private FebsAuthProperties properties;
 
     @Override
@@ -72,8 +68,8 @@ public class FebsAuthorizationServerConfigurer extends AuthorizationServerConfig
     @Override
     @SuppressWarnings("unchecked")
     public void configure(AuthorizationServerEndpointsConfigurer endpoints) {
-        endpoints.tokenStore(jwtTokenStore)
-                .accessTokenConverter(jwtAccessTokenConverter)
+        endpoints.tokenStore(jwtTokenStore())
+                .accessTokenConverter(jwtAccessTokenConverter())
                 .userDetailsService(userDetailService)
                 .authenticationManager(authenticationManager)
                 .exceptionTranslator(exceptionTranslator);
@@ -91,7 +87,7 @@ public class FebsAuthorizationServerConfigurer extends AuthorizationServerConfig
         DefaultUserAuthenticationConverter userAuthenticationConverter = new DefaultUserAuthenticationConverter();
         userAuthenticationConverter.setUserDetailsService(userDetailService);
         defaultAccessTokenConverter.setUserTokenConverter(userAuthenticationConverter);
-        accessTokenConverter.setSigningKey("febs");
+        accessTokenConverter.setSigningKey(properties.getJwtAccessKey());
         return accessTokenConverter;
     }
 

+ 4 - 0
febs-auth/src/main/java/cc/mrbird/febs/auth/properties/FebsAuthProperties.java

@@ -26,4 +26,8 @@ public class FebsAuthProperties {
      * 验证码配置
      */
     private FebsValidateCodeProperties code = new FebsValidateCodeProperties();
+    /**
+     * JWT加签密钥
+     */
+    private String jwtAccessKey;
 }

+ 4 - 3
febs-auth/src/main/java/cc/mrbird/febs/auth/runner/StartedUpRunner.java

@@ -24,9 +24,10 @@ public class StartedUpRunner implements ApplicationRunner {
     @Override
     public void run(ApplicationArguments args) {
         if (context.isActive()) {
-            log.info(" +-+-+-+-+-+-+-+-+");
-            log.info(" |c|o|m|p|l|e|t|e|");
-            log.info(" +-+-+-+-+-+-+-+-+");
+            log.info("  _   _   _   _   _   _   _   _");
+            log.info(" / \\ / \\ / \\ / \\ / \\ / \\ / \\ / \\");
+            log.info("( c | o | m | p | l | e | t | e )");
+            log.info(" \\_/ \\_/ \\_/ \\_/ \\_/ \\_/ \\_/ \\_/");
             log.info("{} 启动完毕,时间:{}", applicationName, LocalDateTime.now());
         }
     }

+ 1 - 0
febs-auth/src/main/resources/febs-auth.properties

@@ -12,6 +12,7 @@ febs.auth.clients[1].scope=test
 febs.auth.clients[1].accessTokenValiditySeconds=3600
 
 febs.auth.anonUrl=/actuator/**,/captcha
+febs.auth.jwtAccessKey=febs
 
 febs.auth.code.time=120
 febs.auth.code.type=png

+ 4 - 3
febs-gateway/src/main/java/cc/mrbird/febs/gateway/runner/StartedUpRunner.java

@@ -24,9 +24,10 @@ public class StartedUpRunner implements ApplicationRunner {
     @Override
     public void run(ApplicationArguments args) {
         if (context.isActive()) {
-            log.info(" +-+-+-+-+-+-+-+-+");
-            log.info(" |c|o|m|p|l|e|t|e|");
-            log.info(" +-+-+-+-+-+-+-+-+");
+            log.info("  _   _   _   _   _   _   _   _");
+            log.info(" / \\ / \\ / \\ / \\ / \\ / \\ / \\ / \\");
+            log.info("( c | o | m | p | l | e | t | e )");
+            log.info(" \\_/ \\_/ \\_/ \\_/ \\_/ \\_/ \\_/ \\_/");
             log.info("{} 启动完毕,时间:{}", applicationName, LocalDateTime.now());
         }
     }

+ 4 - 3
febs-monitor/febs-monitor-admin/src/main/java/cc/mrbird/febs/monitor/admin/runner/StartedUpRunner.java

@@ -25,9 +25,10 @@ public class StartedUpRunner implements ApplicationRunner {
     @Override
     public void run(ApplicationArguments args) {
         if (context.isActive()) {
-            log.info(" +-+-+-+-+-+-+-+-+");
-            log.info(" |c|o|m|p|l|e|t|e|");
-            log.info(" +-+-+-+-+-+-+-+-+");
+            log.info("  _   _   _   _   _   _   _   _");
+            log.info(" / \\ / \\ / \\ / \\ / \\ / \\ / \\ / \\");
+            log.info("( c | o | m | p | l | e | t | e )");
+            log.info(" \\_/ \\_/ \\_/ \\_/ \\_/ \\_/ \\_/ \\_/");
             log.info("{} 启动完毕,时间:{}", applicationName, LocalDateTime.now());
         }
     }

+ 2 - 1
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/configure/FebsServerSystemResourceServerConfigure.java

@@ -32,7 +32,8 @@ public class FebsServerSystemResourceServerConfigure extends ResourceServerConfi
     public void configure(HttpSecurity http) throws Exception {
         String[] anonUrls = StringUtils.splitByWholeSeparatorPreserveAllTokens(properties.getAnonUrl(), ",");
 
-        http.csrf().disable()
+        http.headers().frameOptions().disable()
+                .and().csrf().disable()
                 .requestMatchers().antMatchers(EndpointConstant.ALL)
                 .and()
                 .authorizeRequests()

+ 4 - 3
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/runner/StartedUpRunner.java

@@ -24,9 +24,10 @@ public class StartedUpRunner implements ApplicationRunner {
     @Override
     public void run(ApplicationArguments args) {
         if (context.isActive()) {
-            log.info(" +-+-+-+-+-+-+-+-+");
-            log.info(" |c|o|m|p|l|e|t|e|");
-            log.info(" +-+-+-+-+-+-+-+-+");
+            log.info("  _   _   _   _   _   _   _   _");
+            log.info(" / \\ / \\ / \\ / \\ / \\ / \\ / \\ / \\");
+            log.info("( c | o | m | p | l | e | t | e )");
+            log.info(" \\_/ \\_/ \\_/ \\_/ \\_/ \\_/ \\_/ \\_/");
             log.info("{} 启动完毕,时间:{}", applicationName, LocalDateTime.now());
         }
     }

+ 4 - 3
febs-server/febs-server-test/src/main/java/cc/mrbird/febs/server/test/runner/StartedUpRunner.java

@@ -24,9 +24,10 @@ public class StartedUpRunner implements ApplicationRunner {
     @Override
     public void run(ApplicationArguments args) {
         if (context.isActive()) {
-            log.info(" +-+-+-+-+-+-+-+-+");
-            log.info(" |c|o|m|p|l|e|t|e|");
-            log.info(" +-+-+-+-+-+-+-+-+");
+            log.info("  _   _   _   _   _   _   _   _");
+            log.info(" / \\ / \\ / \\ / \\ / \\ / \\ / \\ / \\");
+            log.info("( c | o | m | p | l | e | t | e )");
+            log.info(" \\_/ \\_/ \\_/ \\_/ \\_/ \\_/ \\_/ \\_/");
             log.info("{} 启动完毕,时间:{}", applicationName, LocalDateTime.now());
         }
     }