feat: login and password

Author: huifer

readme.md

@@ -16,21 +16,46 @@ cd view-redis
 mvn clean install 
 ```
 
-```xml
-		<dependency>
-			<groupId>com.github.huifer</groupId>
-			<artifactId>view-redis-boot</artifactId>
-			<version>last-version</version>
-		</dependency>
 
-```
 
 ## Using
+### 第一种
+- 引入依赖
+
+```xml
+<dependency>
+    <groupId>com.github.huifer</groupId>
+    <artifactId>view-redis-boot</artifactId>
+    <version>1.0-SNAPSHOT</version>
+</dependency>
+```
 
 - 在启动类上增加注解`@EnableViewRedis`
 - 如果有拦截器请将`/redis/**/`作为忽略,不执行拦截器逻辑
 - 访问 `/redis/index` 进入管理页面
 
+### 第二种
+- 引入依赖
+
+```xml
+<dependency>
+    <groupId>com.github.huifer</groupId>
+    <artifactId>view-redis-servlet</artifactId>
+    <version>1.0-SNAPSHOT</version>
+</dependency>
+
+```
+
+- 在启动类上添加`@EnableViewRedisServlet`
+- 设置账号密码, 默认账号密码: **redis-admin\redis-admin**
+```
+view:
+  redis:
+    login_name: admin
+    password: admin
+```
+
+
 
 ## 系统截图
 - redis 配置相关截图

sample/servlet-sample/src/main/resources/application.yml

@@ -8,6 +8,14 @@ spring:
     host: 127.0.0.1
     port: 6379
 
+
+
 logging:
   level:
-    com.github.huifer.view.redis: debug
+    com.github.huifer.view.redis: debug
+
+
+view:
+  redis:
+    login_name: admin
+    password: admin

view-redis-servlet/pom.xml

@@ -28,5 +28,10 @@
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
 </project>

view-redis-servlet/src/main/java/com/github/huifer/view/redis/servlet/Beans.java

@@ -1,23 +1,45 @@
 package com.github.huifer.view.redis.servlet;
 
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.servlet.Servlet;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.stereotype.Component;
 
+import static com.github.huifer.view.redis.servlet.ViewRedisServlet.LOGIN_NAME_PARAM;
+import static com.github.huifer.view.redis.servlet.ViewRedisServlet.PASSWORD_PARAM;
+
 @Component
 @ComponentScan("com.github.huifer.view.redis.*")
+@EnableConfigurationProperties(ViewRedisConfig.class)
 public class Beans {
 
+	@Autowired
+	private ApplicationContext context;
 
 	@Bean
 	public ServletRegistrationBean statViewServletRegistrationBean() {
 		ServletRegistrationBean<Servlet> servletServletRegistrationBean = new ServletRegistrationBean<>();
 		servletServletRegistrationBean.setServlet(new ViewRedisServlet("/support/"));
+		Map<String, String> initParams = new HashMap<>(10);
+		ViewRedisConfig bean = context.getBean(ViewRedisConfig.class);
+
+
+		if (bean != null) {
+
+			initParams.put(LOGIN_NAME_PARAM, bean.getLoginName());
+			initParams.put(PASSWORD_PARAM, bean.getPassword());
+
+		}
+		servletServletRegistrationBean.setInitParameters(initParams);
 		servletServletRegistrationBean.setUrlMappings(Collections.singleton("/redis/*"));
 		return servletServletRegistrationBean;
 	}

view-redis-servlet/src/main/java/com/github/huifer/view/redis/servlet/ViewRedisConfig.java

@@ -0,0 +1,44 @@
+/*
+ *
+ * Copyright 2020 HuiFer All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.github.huifer.view.redis.servlet;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "view.redis")
+public class ViewRedisConfig {
+	private String loginName;
+
+	private String password;
+
+	public String getLoginName() {
+		return loginName;
+	}
+
+	public void setLoginName(String loginName) {
+		this.loginName = loginName;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+}

view-redis-servlet/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -0,0 +1,15 @@
+{
+  "properties": [
+    {
+      "name": "view.redis.login_name",
+      "type": "java.lang.String",
+      "sourceType": "com.github.huifer.view.redis.servlet.ViewRedisConfig"
+    },
+    {
+      "name": "view.redis.password",
+      "type": "java.lang.String",
+      "sourceType": "com.github.huifer.view.redis.servlet.ViewRedisConfig"
+    }
+  ]
+
+}