增加重置管理员命令

Author: master-coder-ll

README.md

@@ -103,7 +103,7 @@
 > 根据配置文件重置密码或者创建新账号。
 ```bash
 # x.y.z 为版本号，版本大于3.1.4提供支持
-java -jar admin-x.y.z.jar restpwd
+java -jar admin-x.y.z.jar --spring.config.location=/opt/jar/admin.yaml restpwd
 ```
 
 

vpn-admin/src/main/java/com/jhl/admin/AdminApplication.java

@@ -5,30 +5,19 @@
 import com.jhl.admin.util.SimpleJpaRepositoryImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpRequest;
 import org.springframework.http.MediaType;
-import org.springframework.http.client.ClientHttpRequestExecution;
-import org.springframework.http.client.ClientHttpRequestInterceptor;
-import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.web.client.RestTemplate;
 
-import javax.annotation.PostConstruct;
-import java.io.IOException;
 import java.util.TimeZone;
-import java.util.concurrent.*;
 
 @SpringBootApplication
 @EnableJpaRepositories(repositoryBaseClass = SimpleJpaRepositoryImpl.class)
@@ -49,18 +38,15 @@ public static void main(String[] args) {
 
 
     @Bean
-    public RestTemplate restTemplate() {
+    public RestTemplate restTemplate(FastJsonHttpMessageConverter fastJsonHttpMessageConverter) {
         RestTemplate restTemplate = new RestTemplate();
-        restTemplate.getInterceptors().add(new ClientHttpRequestInterceptor() {
-            @Override
-            public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException {
-                HttpHeaders headers = request.getHeaders();
-                headers.add("Authorization", DigestUtils.md5Hex(proxyConstant.getAuthPassword()));
-                headers.setContentType(MediaType.APPLICATION_JSON);
-                return execution.execute(request, body);
-            }
+        restTemplate.getInterceptors().add((request, body, execution) -> {
+            HttpHeaders headers = request.getHeaders();
+            headers.add("Authorization", DigestUtils.md5Hex(proxyConstant.getAuthPassword()));
+            headers.setContentType(MediaType.APPLICATION_JSON);
+            return execution.execute(request, body);
         });
-        restTemplate.getMessageConverters().add(new FastJsonHttpMessageConverter());
+        restTemplate.getMessageConverters().add(fastJsonHttpMessageConverter);
         return restTemplate;
     }
 

vpn-admin/src/main/java/com/jhl/admin/config/WebConfig.java

@@ -4,6 +4,7 @@
 import com.google.common.collect.Lists;
 import com.jhl.admin.Interceptor.AuthInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
@@ -19,16 +20,24 @@ public class WebConfig implements WebMvcConfigurer {
     @Autowired
     AuthInterceptor authInterceptor;
 
+    @Autowired
+    FastJsonHttpMessageConverter fastJsonHttpMessageConverter;
     @Override
     public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
+        converters.add(0, fastJsonHttpMessageConverter);
+
+    }
+
+    @Bean
+    public FastJsonHttpMessageConverter fastJsonHttpMessageConverter() {
         FastJsonHttpMessageConverter fastJsonHttpMessageConverter = new FastJsonHttpMessageConverter();
         fastJsonHttpMessageConverter.setSupportedMediaTypes(Lists.newArrayList(MediaType.APPLICATION_JSON));
-        converters.add(0,fastJsonHttpMessageConverter);
-
+        return fastJsonHttpMessageConverter;
     }
 
     /**
      * 拦截器
+     *
      * @param registry
      */
     @Override