shimingxy hace 10 meses
padre
commit
30711097d3
Se han modificado 27 ficheros con 31 adiciones y 67 borrados
  1. 2 2
      maxkey-starter/maxkey-starter-captcha/src/main/java/org/dromara/maxkey/web/contorller/ImageCaptchaEndpoint.java
  2. 1 1
      maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java
  3. 1 1
      maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserPasswordController.java
  4. 1 1
      maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimUserController.java
  5. 0 18
      maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/access/contorller/package-info.java
  6. 1 1
      maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/AppListController.java
  7. 2 2
      maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ChangePasswodController.java
  8. 1 1
      maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ForgotPasswordContorller.java
  9. 2 2
      maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/OneTimePasswordController.java
  10. 1 1
      maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ProfileController.java
  11. 3 3
      maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/RegisterController.java
  12. 1 1
      maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SafeController.java
  13. 1 1
      maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SocialSignOnListController.java
  14. 1 1
      maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java
  15. 0 18
      maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/package-info.java
  16. 1 1
      maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/HistorySignOnAppInterceptor.java
  17. 1 1
      maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/SAML20DetailsController.java
  18. 1 1
      maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfEmailSendersController.java
  19. 1 1
      maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfLdapContextController.java
  20. 1 1
      maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfPasswordPolicyController.java
  21. 1 1
      maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfSmsProviderController.java
  22. 1 1
      maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/InstitutionsController.java
  23. 1 1
      maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java
  24. 1 1
      maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java
  25. 1 1
      maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java
  26. 1 1
      maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/UserInfoController.java
  27. 2 2
      maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/api/endpoint/RestTimeBasedOtpController.java

+ 2 - 2
maxkey-starter/maxkey-starter-captcha/src/main/java/org/dromara/maxkey/web/contorller/ImageCaptchaEndpoint.java

@@ -43,10 +43,10 @@ public class ImageCaptchaEndpoint {
     private static final Logger _logger = LoggerFactory.getLogger(ImageCaptchaEndpoint.class);
     
     @Autowired
-    private Producer captchaProducer;
+    Producer captchaProducer;
     
     @Autowired 
-	protected MomentaryService momentaryService;
+	MomentaryService momentaryService;
     
     @Autowired
 	AuthTokenService authTokenService;

+ 1 - 1
maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java

@@ -49,7 +49,7 @@ public class RestUserInfoController {
 	
     @Autowired
     @Qualifier("userInfoService")
-    private UserInfoService userInfoService;
+    UserInfoService userInfoService;
     
     @GetMapping(value = "/{id}")
     public UserInfo getUser(

+ 1 - 1
maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserPasswordController.java

@@ -41,7 +41,7 @@ public class RestUserPasswordController {
 	
     @Autowired
     @Qualifier("userInfoService")
-    private UserInfoService userInfoService;
+    UserInfoService userInfoService;
     
   
     @PostMapping(value = "/changePassword")

+ 1 - 1
maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimUserController.java

@@ -69,7 +69,7 @@ import org.springframework.web.util.UriComponentsBuilder;
 public class ScimUserController {
 	static final  Logger _logger = LoggerFactory.getLogger(ScimUserController.class);
 	@Autowired
-	private UserInfoService userInfoService;
+	UserInfoService userInfoService;
 	
 	@Autowired
 	GroupsService groupsService;

+ 0 - 18
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/access/contorller/package-info.java

@@ -1,18 +0,0 @@
-/*
- * Copyright [2022] [MaxKey of copyright http://www.maxkey.top]
- * 
- * 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 org.dromara.maxkey.web.access.contorller;

+ 1 - 1
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/AppListController.java

@@ -52,7 +52,7 @@ public class AppListController {
     static final Logger logger = LoggerFactory.getLogger(AppListController.class);
     
     @Autowired
-    private UserInfoService userInfoService;
+    UserInfoService userInfoService;
 
     @Autowired
     AccountsService accountsService;

+ 2 - 2
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ChangePasswodController.java

@@ -42,13 +42,13 @@ public class ChangePasswodController {
 	static final Logger logger = LoggerFactory.getLogger(ChangePasswodController.class);
 
 	@Autowired
-	private UserInfoService userInfoService;
+	UserInfoService userInfoService;
 
 	@Autowired
 	HistorySystemLogsService systemLog;
 
 	@Autowired
-	private CnfPasswordPolicyService passwordPolicyService;
+	CnfPasswordPolicyService passwordPolicyService;
 
 	@GetMapping(value={"/passwordpolicy"})
 	public Message<CnfPasswordPolicy> passwordpolicy(@CurrentUser UserInfo currentUser){

+ 1 - 1
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ForgotPasswordContorller.java

@@ -87,7 +87,7 @@ public class ForgotPasswordContorller {
 	HistorySystemLogsService historySystemLogsService;
 
 	@Autowired
-	private CnfPasswordPolicyService passwordPolicyService;
+	CnfPasswordPolicyService passwordPolicyService;
 
 	@RequestMapping(value={"/passwordpolicy"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public Message<CnfPasswordPolicy> passwordpolicy(){

+ 2 - 2
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/OneTimePasswordController.java

@@ -54,13 +54,13 @@ public class OneTimePasswordController {
     static final  Logger logger  =  LoggerFactory.getLogger(OneTimePasswordController.class);
 
     @Autowired
-    private UserInfoService userInfoService;
+    UserInfoService userInfoService;
 
     @Autowired
     OtpKeyUriFormat otpKeyUriFormat;
 
     @Autowired
-    private TimeBasedOtpAuthn timeBasedOtpAuthn;
+    TimeBasedOtpAuthn timeBasedOtpAuthn;
 
     @RequestMapping(value = {"/timebased"})
     @ResponseBody

+ 1 - 1
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ProfileController.java

@@ -40,7 +40,7 @@ public class ProfileController {
     static final Logger logger = LoggerFactory.getLogger(ProfileController.class);
 
     @Autowired
-    private UserInfoService userInfoService;
+    UserInfoService userInfoService;
     
     @Autowired
 	FileUploadService fileUploadService;

+ 3 - 3
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/RegisterController.java

@@ -57,16 +57,16 @@ public class RegisterController {
 	AuthTokenService authTokenService;
 	
 	@Autowired 
-  	protected ApplicationConfig applicationConfig;
+  	ApplicationConfig applicationConfig;
 	
 	@Autowired
-	private UserInfoService userInfoService;
+	UserInfoService userInfoService;
 	
 	@Autowired
     SmsOtpAuthnService smsOtpAuthnService;
 	
 	@Autowired
-	private PasswordEncoder passwordEncoder;
+	PasswordEncoder passwordEncoder;
  	
 	@ResponseBody
 	@RequestMapping(value = { "/produceOtp" }, produces = {MediaType.APPLICATION_JSON_VALUE})

+ 1 - 1
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SafeController.java

@@ -43,7 +43,7 @@ public class SafeController {
 	static final Logger logger = LoggerFactory.getLogger(SafeController.class);
 	
 	@Autowired
-	private UserInfoService userInfoService;
+	UserInfoService userInfoService;
 	
 	@RequestMapping(value="/forward/setting") 
 	public ModelAndView fowardSetting(@CurrentUser UserInfo currentUser) {

+ 1 - 1
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SocialSignOnListController.java

@@ -42,7 +42,7 @@ public class SocialSignOnListController {
 	static final Logger logger = LoggerFactory.getLogger(SocialSignOnListController.class);
 	
 	@Autowired
-	protected SocialsAssociatesService socialsAssociatesService;
+	SocialsAssociatesService socialsAssociatesService;
 	
 	@RequestMapping(value={"/fetch"})
 	@ResponseBody

+ 1 - 1
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java

@@ -51,7 +51,7 @@ public class LoginAppsHistoryController {
 	static final Logger logger = LoggerFactory.getLogger(LoginAppsHistoryController.class);
 	
 	@Autowired
-  	protected HistoryLoginAppsService historyLoginAppsService;
+  	HistoryLoginAppsService historyLoginAppsService;
 	
 	/**
 	 * @param loginAppsHistory

+ 0 - 18
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/package-info.java

@@ -1,18 +0,0 @@
-/*
- * Copyright [2021] [MaxKey of copyright http://www.maxkey.top]
- * 
- * 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 org.dromara.maxkey.web.historys.contorller;

+ 1 - 1
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/HistorySignOnAppInterceptor.java

@@ -46,7 +46,7 @@ public class HistorySignOnAppInterceptor  implements AsyncHandlerInterceptor  {
     HistoryLoginAppsService historyLoginAppsService;
 
     @Autowired
-    protected AppsService appsService;
+    AppsService appsService;
 
     /**
      * postHandle .

+ 1 - 1
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/SAML20DetailsController.java

@@ -62,7 +62,7 @@ public class SAML20DetailsController   extends BaseAppContorller {
 	static final  Logger logger = LoggerFactory.getLogger(SAML20DetailsController.class);
 	
 	@Autowired
-	private KeyStoreLoader keyStoreLoader;
+	KeyStoreLoader keyStoreLoader;
 	
 	@Autowired
 	AppsSaml20DetailsService saml20DetailsService;

+ 1 - 1
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfEmailSendersController.java

@@ -39,7 +39,7 @@ public class CnfEmailSendersController {
 	static final  Logger logger = LoggerFactory.getLogger(CnfEmailSendersController.class);
 	
 	@Autowired
-	private CnfEmailSendersService emailSendersService;
+	CnfEmailSendersService emailSendersService;
 
 	@RequestMapping(value={"/get"})
 	public Message<?> get(@CurrentUser UserInfo currentUser){

+ 1 - 1
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfLdapContextController.java

@@ -42,7 +42,7 @@ public class CnfLdapContextController {
 	static final  Logger logger = LoggerFactory.getLogger(CnfLdapContextController.class);
 	
 	@Autowired
-	private CnfLdapContextService ldapContextService;
+	CnfLdapContextService ldapContextService;
 
 	@RequestMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public Message<?> get(@CurrentUser UserInfo currentUser){

+ 1 - 1
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfPasswordPolicyController.java

@@ -41,7 +41,7 @@ public class CnfPasswordPolicyController {
 	static final  Logger logger = LoggerFactory.getLogger(CnfPasswordPolicyController.class);
 		
 	@Autowired
-	private CnfPasswordPolicyService passwordPolicyService;
+	CnfPasswordPolicyService passwordPolicyService;
 	
 	@RequestMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public Message<?> get(@CurrentUser UserInfo currentUser){

+ 1 - 1
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfSmsProviderController.java

@@ -40,7 +40,7 @@ public class CnfSmsProviderController {
 	static final  Logger logger = LoggerFactory.getLogger(CnfSmsProviderController.class);
 	
 	@Autowired
-	private CnfSmsProviderService smsProviderService;
+	CnfSmsProviderService smsProviderService;
 
 	@RequestMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public Message<?> get(@CurrentUser UserInfo currentUser){

+ 1 - 1
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/InstitutionsController.java

@@ -37,7 +37,7 @@ public class InstitutionsController {
 		static final  Logger logger = LoggerFactory.getLogger(InstitutionsController.class);
 		
 		@Autowired
-		private InstitutionsService institutionsService;
+		InstitutionsService institutionsService;
 		
 		@RequestMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 		public Message<?> get(@CurrentUser UserInfo currentUser){

+ 1 - 1
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java

@@ -51,7 +51,7 @@ public class LoginEntryPoint {
 	AuthTokenService authTokenService;
 	
 	@Autowired
-  	protected ApplicationConfig applicationConfig;
+  	ApplicationConfig applicationConfig;
  	
 	@Autowired
 	AbstractAuthenticationProvider authenticationProvider ;

+ 1 - 1
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java

@@ -33,7 +33,7 @@ public class LogoutEndpoint {
 	private static Logger logger = LoggerFactory.getLogger(LogoutEndpoint.class);
 	
 	@Autowired
-    protected SessionManager sessionManager;
+    SessionManager sessionManager;
 	
  	@GetMapping(value={"/logout"})
  	public  Message<?> logout(HttpServletRequest request,@CurrentUser UserInfo currentUser){

+ 1 - 1
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java

@@ -46,7 +46,7 @@ public class LoginAppsHistoryController {
 	static final Logger logger = LoggerFactory.getLogger(LoginAppsHistoryController.class);
 	
 	@Autowired
-  	protected HistoryLoginAppsService historyLoginAppsService;
+  	HistoryLoginAppsService historyLoginAppsService;
 	
 	/**
 	 * @param loginAppsHistory

+ 1 - 1
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/UserInfoController.java

@@ -77,7 +77,7 @@ public class UserInfoController {
 	static final Logger logger = LoggerFactory.getLogger(UserInfoController.class);
 	
 	@Autowired
-	private UserInfoService userInfoService;
+	UserInfoService userInfoService;
 	
 	@Autowired
 	FileUploadService fileUploadService;

+ 2 - 2
maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/api/endpoint/RestTimeBasedOtpController.java

@@ -35,10 +35,10 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 public class RestTimeBasedOtpController {
 
 	@Autowired
-    protected AbstractOtpAuthn timeBasedOtpAuthn;
+    AbstractOtpAuthn timeBasedOtpAuthn;
     
     @Autowired
-    private UserInfoService userInfoService;
+    UserInfoService userInfoService;
     
     @Operation(summary = "基于时间令牌验证 API文档模块", description = "传递参数username和token",method="GET")
     @ResponseBody