地址跳转修改

cn.com.taiji.myapp/src/main/resources/application.properties

@@ -114,4 +114,8 @@ viewrole=
 aksk=gxwzgxwz
 breakpoint.upload.chunkSize=5242880
 #sso配置地址
-ssoAddress=http://200.1.70.44:8088/authn-api/v5/cas/518130388732796928/logout?service=http://200.1.70.107:8273/login
+ssoAddress1=http://10.149.2.125:8088/authn-api/v5/cas/518130388732796928/logout?service=http://10.149.2.124:8273/login
+ssoAddress2=http://200.1.70.44:8088/authn-api/v5/cas/518130388732796928/logout?service=http://200.1.70.107:8273/login
+
+ssoAddressLogin=http://10.149.2.125:8088/authn-api/v5/cas/518130388732796928/login?service=http://10.149.2.124:8273/login
+

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

@@ -100,7 +100,7 @@ public class MyUsernamePasswordAuthenticationFilter extends UsernamePasswordAuth
 		if (StringUtils.isNotEmpty(ticket)){
 			ssoFlag=true;
 			String url ="http://200.1.70.44:8088/authn-api/v5/cas/518130388732796928/p3/serviceValidate?ticket="+ticket
-					+"&format=json&service=http://200.1.70.150:8273/zcgllogin";
+					+"&format=json&service=http://10.149.2.124:8273/login";
 			result=ssoService.httpGet(url);
 
 			String ssoId = result.getId();

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

@@ -14,6 +14,8 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -29,6 +31,7 @@ import java.util.*;
  */
 @Service
 public class SsoSyncService {
+    private static final Logger logger = LoggerFactory.getLogger(SsoSyncService.class);
 
     @Autowired
     private SysDeptService sysDeptService;
@@ -54,30 +57,40 @@ public class SsoSyncService {
                 if (StringUtils.isNotEmpty(ssoDeptDto.getPARENT_ID())){//有父节点
                     Dept parenDept = sysDeptService.findDeptByOrgId(ssoDeptDto.getPARENT_ID());
                     if (Objects.nonNull(parenDept)){//父节点在系统不为空,无父节点不同步，等下一批次
-                        if (ssoDeptDto.getPARENT_ID().equals("515959718506717184")&&ssoDeptDto.getORG_ID().equals("515959718884204544")){//应急局下，只增加直属单位
-                            if (Objects.isNull(dept)){//部门不存在，部门存在不做处理
-                                newDept.setDeptId(orgId);
-                                newDept.setDeptIndex(3);
-                                newDept.setDeptName(ssoDeptDto.getORG_NAME());
-                                newDept.setParent(parenDept);
-                                newDept.setUpdateTime(new Date(ssoDeptDto.getUPDATE_TIME()));
-                                newDept.setPdeptids(parenDept.getPdeptids()+","+orgId);
-                                newDept.setOrgId(orgId);
-                                sysDeptService.saveAndUpdateDeptInfo(newDept);
-                            }
+                        if (Objects.isNull(dept)){//部门不存在，部门存在不做处理
+                            newDept.setDeptId(orgId);
+                            newDept.setDeptIndex(3);
+                            newDept.setDeptName(ssoDeptDto.getORG_NAME());
+                            newDept.setParent(parenDept);
+                            newDept.setUpdateTime(new Date(ssoDeptDto.getUPDATE_TIME()));
+                            newDept.setPdeptids(parenDept.getPdeptids()+","+orgId);
+                            newDept.setOrgId(orgId);
+                            sysDeptService.saveAndUpdateDeptInfo(newDept);
                         }
-                        if (!ssoDeptDto.getPARENT_ID().equals("515959718506717184")){
-                            if (Objects.isNull(dept)){//部门不存在，部门存在不做处理
-                                newDept.setDeptId(orgId);
-                                newDept.setDeptIndex(3);
-                                newDept.setDeptName(ssoDeptDto.getORG_NAME());
-                                newDept.setParent(parenDept);
-                                newDept.setUpdateTime(new Date(ssoDeptDto.getUPDATE_TIME()));
-                                newDept.setPdeptids(parenDept.getPdeptids()+","+orgId);
-                                newDept.setOrgId(orgId);
+//                        if (ssoDeptDto.getPARENT_ID().equals("515959718506717184")&&ssoDeptDto.getORG_ID().equals("515959718884204544")){//应急局下，只增加直属单位
+//                            if (Objects.isNull(dept)){//部门不存在，部门存在不做处理
+//                                newDept.setDeptId(orgId);
+//                                newDept.setDeptIndex(3);
+//                                newDept.setDeptName(ssoDeptDto.getORG_NAME());
+//                                newDept.setParent(parenDept);
+//                                newDept.setUpdateTime(new Date(ssoDeptDto.getUPDATE_TIME()));
+//                                newDept.setPdeptids(parenDept.getPdeptids()+","+orgId);
+//                                newDept.setOrgId(orgId);
                                 sysDeptService.saveAndUpdateDeptInfo(newDept);
-                            }
-                        }
+//                            }
+//                        }
+//                        if (!ssoDeptDto.getPARENT_ID().equals("515959718506717184")){
+//                            if (Objects.isNull(dept)){//部门不存在，部门存在不做处理
+//                                newDept.setDeptId(orgId);
+//                                newDept.setDeptIndex(3);
+//                                newDept.setDeptName(ssoDeptDto.getORG_NAME());
+//                                newDept.setParent(parenDept);
+//                                newDept.setUpdateTime(new Date(ssoDeptDto.getUPDATE_TIME()));
+//                                newDept.setPdeptids(parenDept.getPdeptids()+","+orgId);
+//                                newDept.setOrgId(orgId);
+//                                sysDeptService.saveAndUpdateDeptInfo(newDept);
+//                            }
+//                        }
 
 
                     }
@@ -123,16 +136,18 @@ public class SsoSyncService {
                         dbdcUserService.insertRoleUser(roleUserPK);
                         dbdcUserService.saveDeptUser(dept.getDeptId(),ssoUserDto.getUSER_ID());
                     }
-                }else {
-                    if (Objects.nonNull(dept)){
-                        userDto.setDeptid(dept.getDeptId());
-                        userDto.setPdeptids(dept.getPdeptids());
-                        dbdcUserService.updateUser(userDto);
-                        dbdcUserService.saveDeptUser(dept.getDeptId(),ssoUserDto.getUSER_ID());
-                    }
                 }
+//                else {
+//                    if (Objects.nonNull(dept)){
+//                        userDto.setDeptid(dept.getDeptId());
+//                        userDto.setPdeptids(dept.getPdeptids());
+//                        dbdcUserService.updateUser(userDto);
+//                        dbdcUserService.saveDeptUser(dept.getDeptId(),ssoUserDto.getUSER_ID());
+//                    }
+//                }
             }
         }
+        logger.info("用户同步完毕");
     }
 
     public List<SsoDeptDto> getSsoDept(){
@@ -184,7 +199,7 @@ public class SsoSyncService {
 
     public static void main(String args[]){
         SsoSyncService ssoSyncService= new SsoSyncService();
-        ssoSyncService.syncUser();
+        ssoSyncService.syncDept();
     }
 
 

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

@@ -92,8 +92,10 @@ public class DbdcSysController {
     public int mlshValue;
     @Value("${indicators.gjshValue}")
     public int gjshValue;
-    @Value("${ssoAddress}")
-	public String ssoAddress;
+    @Value("${ssoAddress1}")
+	public String ssoAddress1;
+	@Value("${ssoAddress2}")
+	public String ssoAddress2;
     @Inject
     LoginfoService loginfoService;
     @Inject
@@ -238,6 +240,13 @@ public class DbdcSysController {
 			}
 		}
 	}
+	String url =request.getServerName();
+	String ssoAddress="";
+	if (url.equals("10.149.2.124")){
+		ssoAddress=ssoAddress1;
+	}else {
+		ssoAddress=ssoAddress2;
+	}
 	return "redirect:"+ssoAddress;
     }
     @RequestMapping(value = "/logoutbywz")

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

@@ -17,17 +17,23 @@ import javax.servlet.http.HttpServletRequest;
 @RequestMapping(value = "/ssoLogin")
 public class SsoLogin {
 
-    @Value("${ssoAddress}")
-    public String ssoAddress;
+    @Value("${ssoAddress1}")
+    public String ssoAddress1;
+    @Value("${ssoAddress2}")
+    public String ssoAddress2;
+    @Value("${ssoAddressLogin}")
+    public String ssoAddressLogin;
 
     @RequestMapping(value = "login")
     public String ssoLogin(HttpServletRequest request){
         String type=request.getParameter("type");
+        String url =request.getServerName();
         if (StringUtils.isNotEmpty(type)&&type.equals("self")){
             return "redirect:/dbdc/sysframe";
+        }else if (url.equals("10.149.2.124")){
+            return "redirect:"+ssoAddressLogin;
         }else {
-            return "redirect:"+ssoAddress;
-
+            return "redirect:"+ssoAddressLogin;
         }
     }
 }

cn.com.taiji.system/src/main/resources/templates/thymeleaf/deptinfo/deptinfo_edit.html

@@ -56,9 +56,9 @@
 
 							</tr>
 							<tr>
-								<th><font class="fontred">*</font>统一社会信用代码</th>
+								<th>统一社会信用代码</th>
 								<td><input type="text" name="creditno" datatype="*1-50"
-									nullmsg="必填" sucmsg="&nbsp;" errormsg="输入字符超过50或存在特殊字符"
+									nullmsg="必填" sucmsg="&nbsp;" errormsg="输入字符超过50或存在特殊字符" ignore="ignore"
 									id="creditno" class="input-normal input-wdl" th:value="${dept.creditno}"/></td>
 								<th>机构描述</th>
 								<td><input type="text" th:value="${dept.deptDesc}"