From ef4874962ef786254a24b0e0dd76681bec02235b Mon Sep 17 00:00:00 2001 From: Kane Wang Date: Fri, 16 Dec 2022 11:49:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0ldap=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 企业级管理系统/java/AdminSys/pom.xml | 13 ++- .../xim/myutils/account/LdapAccountCheck.java | 64 +++++++++++++ .../xim/myutils/account/P13AccountCheck.java | 16 ---- .../xim/myutils/config/json/AppConfig.java | 20 ++++ .../myutils/config/json/DatabaseConfig.java | 24 +++++ .../account/P13AccountCheckController.java | 4 +- .../web/listener/ContextLoaderListener.java | 33 ++++++- .../target/admin-system/file_upload.html | 92 ------------------- .../AdminSys/target/admin-system/test.html | 37 -------- .../compile/default-compile/createdFiles.lst | 4 +- .../compile/default-compile/inputFiles.lst | 4 +- .../default-testCompile/createdFiles.lst | 1 + .../default-testCompile/inputFiles.lst | 1 + 13 files changed, 161 insertions(+), 152 deletions(-) create mode 100644 企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/myutils/account/LdapAccountCheck.java delete mode 100644 企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/myutils/account/P13AccountCheck.java create mode 100644 企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/myutils/config/json/AppConfig.java create mode 100644 企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/myutils/config/json/DatabaseConfig.java delete mode 100644 企业级管理系统/java/AdminSys/target/admin-system/file_upload.html delete mode 100644 企业级管理系统/java/AdminSys/target/admin-system/test.html create mode 100644 企业级管理系统/java/AdminSys/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst create mode 100644 企业级管理系统/java/AdminSys/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst diff --git a/企业级管理系统/java/AdminSys/pom.xml b/企业级管理系统/java/AdminSys/pom.xml index e99334a..23a544b 100644 --- a/企业级管理系统/java/AdminSys/pom.xml +++ b/企业级管理系统/java/AdminSys/pom.xml @@ -1,4 +1,5 @@ - 4.0.0 com.cpic.xim @@ -12,7 +13,7 @@ junit junit - 3.8.1 + 4.13.2 test @@ -90,6 +91,14 @@ maven-war-plugin 3.2.2 + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M6 + + true + + diff --git a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/myutils/account/LdapAccountCheck.java b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/myutils/account/LdapAccountCheck.java new file mode 100644 index 0000000..1685fd2 --- /dev/null +++ b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/myutils/account/LdapAccountCheck.java @@ -0,0 +1,64 @@ +/* + * @Author: Kane + * @Date: 2022-12-15 09:51:12 + * @LastEditors: Kane + * @LastEditTime: 2022-12-16 10:57:38 + * @FilePath: \AdminSys\src\main\java\com\cpic\xim\myutils\account\LdapAccountCheck.java + * @Description: + * + * Copyright (c) ${2022} by Kane, All Rights Reserved. + */ +package com.cpic.xim.myutils.account; + +import javax.naming.CommunicationException; +import javax.naming.Context; +import javax.naming.NamingException; +import javax.naming.directory.DirContext; +import javax.naming.directory.InitialDirContext; +import java.util.Hashtable; + +public class LdapAccountCheck +{ + private static String ldapServerUrl = "ldap://10.39.0.205:389"; + + public static boolean ldapLogin( String userName, String password ) + { + boolean result = false; + + if ( userName.endsWith( "@pr.intra.cpic.com.cn" ) == false) + { + userName += "@pr.intra.cpic.com.cn"; + } + + DirContext ctx = null; + Hashtable ldap = new Hashtable(); + + ldap.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" ); + ldap.put( Context.SECURITY_AUTHENTICATION, "simple" ); + ldap.put( Context.PROVIDER_URL, ldapServerUrl ); + ldap.put( Context.SECURITY_PRINCIPAL, userName ); + ldap.put( Context.SECURITY_CREDENTIALS, password ); + + try + { + ctx = new InitialDirContext( ldap ); + ctx.close(); + + result = true; + } + catch ( CommunicationException error ) + { + error.printStackTrace(); + error.getMessage(); + + result = false; + } + catch ( NamingException error ) + { + error.printStackTrace(); + result = false; + } + + return result; + } +} diff --git a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/myutils/account/P13AccountCheck.java b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/myutils/account/P13AccountCheck.java deleted file mode 100644 index 5c27d5d..0000000 --- a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/myutils/account/P13AccountCheck.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * @Author: Kane - * @Date: 2022-12-15 09:51:12 - * @LastEditors: Kane - * @LastEditTime: 2022-12-15 10:04:36 - * @FilePath: \AdminSys\src\main\java\com\cpicxim\myutils\account\P13AccountCheck.java - * @Description: - * - * Copyright (c) ${2022} by Kane, All Rights Reserved. - */ -package com.cpic.xim.myutils.account; - -public class P13AccountCheck -{ - -} diff --git a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/myutils/config/json/AppConfig.java b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/myutils/config/json/AppConfig.java new file mode 100644 index 0000000..1f937e2 --- /dev/null +++ b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/myutils/config/json/AppConfig.java @@ -0,0 +1,20 @@ +/* + * @Author: Kane + * @Date: 2022-12-16 08:50:47 + * @LastEditors: Kane + * @LastEditTime: 2022-12-16 10:15:11 + * @FilePath: \AdminSys\src\main\java\com\cpic\xim\myutils\config\json\AppConfig.java + * @Description: 应用的JSON格式配置文件对象 + * + * Copyright (c) ${2022} by Kane, All Rights Reserved. + */ +package com.cpic.xim.myutils.config.json; + +import com.fasterxml.jackson.annotation.JsonProperty; + +@SuppressWarnings( +{ "unused"}) +public class AppConfig +{ + +} diff --git a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/myutils/config/json/DatabaseConfig.java b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/myutils/config/json/DatabaseConfig.java new file mode 100644 index 0000000..635d796 --- /dev/null +++ b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/myutils/config/json/DatabaseConfig.java @@ -0,0 +1,24 @@ +/* + * @Author: Kane + * @Date: 2022-12-16 08:55:32 + * @LastEditors: Kane + * @LastEditTime: 2022-12-16 10:15:42 + * @FilePath: \AdminSys\src\main\java\com\cpic\xim\myutils\config\json\DatabaseConfig.java + * @Description: + * + * Copyright (c) ${2022} by Kane, All Rights Reserved. + */ +package com.cpic.xim.myutils.config.json; + +import com.fasterxml.jackson.annotation.JsonProperty; + +@SuppressWarnings( +{ "unused"}) +public class DatabaseConfig +{ + private String dbType; + private String userName; + private String password; + private String dbName; + private String jdbcURL; +} diff --git a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/account/P13AccountCheckController.java b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/account/P13AccountCheckController.java index 44d0fdb..87360cb 100644 --- a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/account/P13AccountCheckController.java +++ b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/account/P13AccountCheckController.java @@ -2,7 +2,7 @@ * @Author: Kane * @Date: 2022-12-15 11:11:21 * @LastEditors: Kane - * @LastEditTime: 2022-12-15 21:15:07 + * @LastEditTime: 2022-12-16 10:17:24 * @FilePath: \AdminSys\src\main\java\com\cpic\xim\web\controllers\account\P13AccountCheckController.java * @Description: P13账号验证用Controller。 * @@ -36,7 +36,7 @@ public class P13AccountCheckController P13AccountCheckResult result = new P13AccountCheckResult(); ServletContext context = request.getServletContext(); - context.getAttribute( null ); + // context.getAttribute( null ); return result; } diff --git a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/listener/ContextLoaderListener.java b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/listener/ContextLoaderListener.java index b8d19db..c855938 100644 --- a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/listener/ContextLoaderListener.java +++ b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/listener/ContextLoaderListener.java @@ -2,7 +2,7 @@ * @Author: Kane * @Date: 2022-12-15 19:40:12 * @LastEditors: Kane - * @LastEditTime: 2022-12-15 19:53:22 + * @LastEditTime: 2022-12-16 10:14:54 * @FilePath: \AdminSys\src\main\java\com\cpic\xim\web\listener\ContextLoaderListener.java * @Description: * @@ -10,17 +10,48 @@ */ package com.cpic.xim.web.listener; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; +import com.fasterxml.jackson.databind.ObjectMapper; +@SuppressWarnings( +{ "unused"}) public class ContextLoaderListener implements ServletContextListener { + private static final int BUFFER_SIZE = 1024; + private static final String CONFIG_FILE_CHARSET = "UTF-8"; + @Override public void contextInitialized( ServletContextEvent event ) { ServletContext context = event.getServletContext(); + String configFileLocation = context.getInitParameter( "config_file_location" ); + + // loadConfig( configFileLocation ); + } + + private void loadConfig( String configFileLocation ) + { + ObjectMapper mapper = new ObjectMapper(); + FileInputStream configFile = null; + InputStreamReader in = null; + StringBuilder json = null; + char[] buffer = new char[BUFFER_SIZE]; + + try + { + configFile = new FileInputStream( configFileLocation ); + } + catch ( IOException exception ) + { + + } + } } diff --git a/企业级管理系统/java/AdminSys/target/admin-system/file_upload.html b/企业级管理系统/java/AdminSys/target/admin-system/file_upload.html deleted file mode 100644 index 0446d69..0000000 --- a/企业级管理系统/java/AdminSys/target/admin-system/file_upload.html +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - 上传文件测试！ - - - - - -
-
- - -
- - -
- - - diff --git a/企业级管理系统/java/AdminSys/target/admin-system/test.html b/企业级管理系统/java/AdminSys/target/admin-system/test.html deleted file mode 100644 index fdf7bba..0000000 --- a/企业级管理系统/java/AdminSys/target/admin-system/test.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - Document - - - - - - -
- -
    -
  1. 测试
    2. -
  2. 测试
    3. -
  3. 测试
    4. -
  4. 测试
    5. -
  5. 测试
    6. -
  6. 测试
    7. -
-
- - diff --git a/企业级管理系统/java/AdminSys/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/企业级管理系统/java/AdminSys/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index f7ef356..30cc191 100644 --- a/企业级管理系统/java/AdminSys/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/企业级管理系统/java/AdminSys/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,8 +1,10 @@ com\cpic\xim\myutils\config\json\ConfigLoader.class com\cpic\xim\web\controllers\account\P13AccountCheckResult.class +com\cpic\xim\myutils\config\json\AppConfig.class com\cpic\xim\web\filters\cros\CrosFilter.class -com\cpic\xim\myutils\account\P13AccountCheck.class com\cpic\xim\web\listener\ContextLoaderListener.class +com\cpic\xim\myutils\config\json\DatabaseConfig.class com\cpic\xim\web\controllers\account\P13AccountCheckController.class com\cpic\xim\web\controllers\account\P13AccountCheckRequest.class com\cpic\xim\myutils\account\CpicXIMStaffInfo.class +com\cpic\xim\myutils\account\LdapAccountCheck.class diff --git a/企业级管理系统/java/AdminSys/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/企业级管理系统/java/AdminSys/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 1ac2d26..2d13b27 100644 --- a/企业级管理系统/java/AdminSys/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/企业级管理系统/java/AdminSys/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -3,6 +3,8 @@ F:\练手代码\vue-learning\企业级管理系统\java\AdminSys\src\main\java\c F:\练手代码\vue-learning\企业级管理系统\java\AdminSys\src\main\java\com\cpic\xim\web\controllers\account\P13AccountCheckController.java F:\练手代码\vue-learning\企业级管理系统\java\AdminSys\src\main\java\com\cpic\xim\web\filters\cros\CrosFilter.java F:\练手代码\vue-learning\企业级管理系统\java\AdminSys\src\main\java\com\cpic\xim\myutils\account\CpicXIMStaffInfo.java -F:\练手代码\vue-learning\企业级管理系统\java\AdminSys\src\main\java\com\cpic\xim\myutils\account\P13AccountCheck.java +F:\练手代码\vue-learning\企业级管理系统\java\AdminSys\src\main\java\com\cpic\xim\myutils\account\LdapAccountCheck.java +F:\练手代码\vue-learning\企业级管理系统\java\AdminSys\src\main\java\com\cpic\xim\myutils\config\json\AppConfig.java F:\练手代码\vue-learning\企业级管理系统\java\AdminSys\src\main\java\com\cpic\xim\web\listener\ContextLoaderListener.java +F:\练手代码\vue-learning\企业级管理系统\java\AdminSys\src\main\java\com\cpic\xim\myutils\config\json\DatabaseConfig.java F:\练手代码\vue-learning\企业级管理系统\java\AdminSys\src\main\java\com\cpic\xim\myutils\config\json\ConfigLoader.java diff --git a/企业级管理系统/java/AdminSys/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/企业级管理系统/java/AdminSys/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 0000000..9863d93 --- /dev/null +++ b/企业级管理系统/java/AdminSys/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +com\cpic\xim\myutils\account\LdapAccountCheckTest.class diff --git a/企业级管理系统/java/AdminSys/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/企业级管理系统/java/AdminSys/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 0000000..8b3d2a8 --- /dev/null +++ b/企业级管理系统/java/AdminSys/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +F:\练手代码\vue-learning\企业级管理系统\java\AdminSys\src\test\java\com\cpic\xim\myutils\account\LdapAccountCheckTest.java