springcloud &springcloud alibaba & nacos support

springcloud &springcloud alibaba & nacos support

maxkey-webs/maxkey-boot-monitor/src/main/java/org/maxkey/boot/monitor/MaxKeyBootMonitor.java

@@ -6,6 +6,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.Configuration;
 
 import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
@@ -14,6 +15,7 @@ import de.codecentric.boot.admin.server.config.EnableAdminServer;
 
 @Configuration
 @EnableAdminServer
+@EnableDiscoveryClient
 @SpringBootApplication(
         exclude={
                 RedisAutoConfiguration.class,

maxkey-webs/maxkey-boot-monitor/src/main/java/org/maxkey/boot/monitor/MonitorSecurityConfigurer.java

@@ -14,24 +14,24 @@ public class MonitorSecurityConfigurer extends WebSecurityConfigurerAdapter {
 
     @Override
     protected void configure(HttpSecurity http) throws Exception {
-        // <EFBFBD><EFBFBD>¼<EFBFBD>ɹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        // 登录成功处理类
         SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
         successHandler.setTargetUrlParameter("redirectTo");
         successHandler.setDefaultTargetUrl("/");
 
         http.authorizeRequests()
-                //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤
+                //无需认证
                 .antMatchers(
-                            "/login",           //<EFBFBD><EFBFBD>¼ҳ<EFBFBD><EFBFBD>
-                            "/assets/**",       //<EFBFBD><EFBFBD>̬<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-                            "/actuator/**",     //springboot-admin<EFBFBD><EFBFBD><EFBFBD>ص<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-                            "/instances/**"     //springboot-admin<EFBFBD><EFBFBD><EFBFBD>ص<EFBFBD>ʵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+                            "/login",           //登录页面
+                            "/assets/**",       //静态文件允许访问
+                            "/actuator/**",     //springboot-admin监控的请求
+                            "/instances/**"     //springboot-admin监控的实例信息请求
                 ).permitAll()
-                //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><EFBFBD>¼
+                //其他所有请求需要登录
                 .anyRequest().authenticated()
-                //<EFBFBD><EFBFBD>¼
+                //登录
                 .and().formLogin().loginPage("/login").successHandler(successHandler)
-                //<EFBFBD>dz<EFBFBD>
+                //登出
                 .and().logout().logoutUrl("/logout").logoutSuccessUrl("/login")
                 .and().httpBasic()
                 .and().csrf()

maxkey-webs/maxkey-boot-monitor/src/main/resources/application.properties

@@ -16,8 +16,13 @@
 #MaxKey Title and Version                                                  #
 ############################################################################
 application.title=MaxKey
-spring.application.name=maxkey-boot-admin-server
+#for dynamic service discovery
+spring.application.name=maxkey-monitor
 application.formatted-version=v2.9.0 GA
+#nacos
+spring.cloud.nacos.discovery.enabled=false
+spring.cloud.nacos.discovery.instance-enabled=false
+spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
 
 server.port=9528
 

maxkey-webs/maxkey-boot-monitor/src/main/resources/bootstrap.properties

@@ -0,0 +1,12 @@
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+
+# Nacos \u63A7\u5236\u53F0\u6DFB\u52A0\u914D\u7F6E\uFF1A
+# Data ID\uFF1Amaxkey-monitor.properties
+# Group\uFF1ADEFAULT_GROUP
+# \u914D\u7F6E\u5185\u5BB9\uFF1A
+spring.application.name=maxkey-monitor
+# \u6307\u5B9A\u914D\u7F6E\u7684\u540E\u7F00\uFF0C\u652F\u6301 properties\u3001yaml\u3001yml\uFF0C\u9ED8\u8BA4\u4E3A properties
+spring.cloud.nacos.config.file-extension=properties
+#spring.cloud.nacos.config.file-extension=yaml
+#\u662F\u5426\u542F\u7528nacos\u914D\u7F6E
+spring.cloud.nacos.config.enabled=false

maxkey-webs/maxkey-boot-monitor/src/main/resources/log4j2.xml

@@ -23,6 +23,7 @@
     	<Logger level="INFO"	name="org.springframework" ></Logger>
     	<Logger level="INFO"	name="org.apache.logging" ></Logger>
     	<Logger level="DEBUG"	name="org.maxkey" ></Logger>
+    	<Logger level="ERROR"	name="org.reflections.Reflections" ></Logger>
     	
         <Root  level="INFO">  
             <AppenderRef  ref="consolePrint" />