登入页重定向，及quartz添加配置使用pgs

cn.com.taiji.myapp/src/main/java/cn/com/taiji/Application.java

@@ -18,6 +18,7 @@ import javax.sql.DataSource;
 
 import cn.com.taiji.sys.service.*;
 import cn.com.taiji.zhongxiao.service.DbdcUserService;
+import cn.com.taiji.zhongxiao.web.SsoLogin;
 import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.RepositoryService;
@@ -492,6 +493,8 @@ public class Application extends WebMvcConfigurerAdapter implements CommandLineR
 		@Autowired
 		private SsoService ssoService;
 		@Autowired
+		private SsoLogin ssoLogin;
+		@Autowired
 		private DbdcUserService dbdcUserService;
 		@Autowired
 		private MySessionControlStrategy concurrentSessionControlStrategy;
@@ -531,8 +534,10 @@ public class Application extends WebMvcConfigurerAdapter implements CommandLineR
 					.setSessionAuthenticationStrategy(concurrentSessionControlStrategy);
 			customUsernamePasswordAuthenticationFilter.setUserService(userService);
 			customUsernamePasswordAuthenticationFilter.setSsoService(ssoService);
+			customUsernamePasswordAuthenticationFilter.setSsoLogin(ssoLogin);
 			customUsernamePasswordAuthenticationFilter.setDbdcUserService(dbdcUserService);
-			customUsernamePasswordAuthenticationFilter.setFilterProcessesUrl("/login*");
+			customUsernamePasswordAuthenticationFilter.setFilterProcessesUrl("/login");
+//			customUsernamePasswordAuthenticationFilter.setFilterProcessesUrl("/ssoLogin/login");
 			customUsernamePasswordAuthenticationFilter.setAllowEmptyValidateCode(true);
 			return customUsernamePasswordAuthenticationFilter;
 		}
@@ -612,6 +617,7 @@ public class Application extends WebMvcConfigurerAdapter implements CommandLineR
 			http.authorizeRequests()
 
 					.filterSecurityInterceptorOncePerRequest(true)// 过滤器的安全拦截器的每一次的要求
+					.antMatchers("/ssoLogin/login").permitAll()
 					.antMatchers("/image").permitAll() // for login
 					.antMatchers("/dbdc/caslogin").permitAll().antMatchers("/dbdc/tjcaslogin").permitAll()
 					.antMatchers("/dbdc/tjcaslogin").permitAll()

cn.com.taiji.myapp/src/main/java/cn/com/taiji/quartz/common/config/QuartzConfig.java

@@ -64,7 +64,7 @@ public class QuartzConfig {
 		prop.put("org.quartz.dataSource.quartzDataSource.user", driverUser);
 		prop.put("org.quartz.dataSource.quartzDataSource.password", driverPwd);
 		prop.put("org.quartz.dataSource.quartzDataSource.maxConnections", "10");
-//		prop.put("org.quartz.jobStore.driverDelegateClass","org.quartz.impl.jdbcjobstore.PostgreSQLDelegate");
+		prop.put("org.quartz.jobStore.driverDelegateClass","org.quartz.impl.jdbcjobstore.PostgreSQLDelegate");
 
 
 		return prop;

cn.com.taiji.myapp/src/main/java/cn/com/taiji/safety/permission/PermissionFilter.java

@@ -53,7 +53,7 @@ public class PermissionFilter extends OncePerRequestFilter {
 						||url.startsWith("/dbdc/synchronizeInfo")
 						|| url.startsWith("/uploadfile")||url.startsWith("/dbdc/tjcaslogin")||url.startsWith("/dbdc/logoutbywz")||url.startsWith("/dbdc/caslogin")||url.startsWith("/dbdc/sysframe")
 						|| url.startsWith("/websocket-logger-js")
-						|| url.startsWith("/favicon.ico")) {
+						|| url.startsWith("/favicon.ico")||url.startsWith("/ssoLogin/login")) {
     	            filterChain.doFilter(request, response);
     	        }else if(ToolUtil.isNull(url)){ //回到登录页面
     	        	response.sendRedirect("/zcgllogin");

cn.com.taiji.security/src/main/java/cn/com/taiji/security/MyUsernamePasswordAuthenticationFilter.java

@@ -15,6 +15,7 @@ import cn.com.taiji.sys.dto.SsoUseDto;
 import cn.com.taiji.sys.dto.UserDto;
 import cn.com.taiji.sys.service.SsoService;
 import cn.com.taiji.zhongxiao.service.DbdcUserService;
+import cn.com.taiji.zhongxiao.web.SsoLogin;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.authentication.AuthenticationServiceException;
@@ -65,6 +66,8 @@ public class MyUsernamePasswordAuthenticationFilter extends UsernamePasswordAuth
 
 	private SsoService ssoService;
 
+	private SsoLogin ssoLogin;
+
 	private DbdcUserService dbdcUserService;
 
 	public void setLoadingCacheService(LoadingCacheService loadingCacheService) {
@@ -463,4 +466,7 @@ public class MyUsernamePasswordAuthenticationFilter extends UsernamePasswordAuth
 		this.sessionRegistryImpl = sessionRegistryImpl;
 	}
 
+	public void setSsoLogin(SsoLogin ssoLogin) {
+		this.ssoLogin = ssoLogin;
+	}
 }

cn.com.taiji.system/src/main/java/cn/com/taiji/zhongxiao/service/SsoSyncService.java

@@ -35,7 +35,6 @@ public class SsoSyncService {
     @Autowired
     private DbdcUserService dbdcUserService;
 
-//    @Scheduled(cron = "0/10 * * * * ?")
     public void ssoSync(){
         boolean flag = syncDept();
         if (flag){

cn.com.taiji.system/src/main/java/cn/com/taiji/zhongxiao/web/SsoLogin.java

@@ -0,0 +1,33 @@
+package cn.com.taiji.zhongxiao.web;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Author：guoyq
+ * @name：SsoLogin
+ * @Date：2024/9/3 18:31
+ * @Filename：SsoLogin
+ */
+@Controller
+@RequestMapping(value = "/ssoLogin")
+public class SsoLogin {
+
+    @Value("${ssoAddress}")
+    public String ssoAddress;
+
+    @RequestMapping(value = "login")
+    public String ssoLogin(HttpServletRequest request){
+        String type=request.getParameter("type");
+        if (StringUtils.isNotEmpty(type)&&type.equals("self")){
+            return "redirect:/dbdc/sysframe";
+        }else {
+            return "redirect:"+ssoAddress;
+
+        }
+    }
+}