CPICXIM/new-citizen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

将springmvc升级到6.2.4。

Browse Source
This commit is contained in:
Kane Wang 2025-05-07 14:29:01 +08:00
parent 5a3b118f02
commit 7160a58245
5 changed files with 79 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
code/backend/NewCitizenIdentify/pom.xml
View File

@ -13,12 +13,20 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>8</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target> <maven.compiler.target>8</maven.compiler.target>
<spring.version>5.3.24</spring.version> <spring.version>6.2.4</spring.version>
<log4j.version>2.24.3</log4j.version>
<jackson.version>2.18.3</jackson.version>
<!-- <spring.version>6.0.8</spring.version> --> <!-- <spring.version>6.0.8</spring.version> -->
</properties> </properties>
<dependencies> <dependencies>
<!-- https://mvnrepository.com/artifact/junit/junit --> <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.17</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
@ -48,49 +56,64 @@
<version>${spring.version}</version> <version>${spring.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version> <version>4.0.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> -->
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.1.0</version>
<scope>provided</scope>
</dependency> </dependency>
<!--文件上传依赖的两个jar包--> <!-- log4j -->
<dependency> <dependency>
<groupId>commons-fileupload</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>commons-fileupload</artifactId> <artifactId>log4j-core</artifactId>
<version>1.5</version> <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>org.apache.directory.studio</groupId>
<artifactId>commons-io</artifactId> <artifactId>org.apache.commons.codec</artifactId>
<version>2.11.0</version> <version>1.8</version>
</dependency> </dependency>
<!--jackson--> <!-- jackson -->
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
<version>2.14.2</version> <version>${jackson.version}</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId> <artifactId>jackson-core</artifactId>
<version>2.13.4</version> <version>${jackson.version}</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations -->
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
<version>2.13.4</version> <version>${jackson.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.oracle</groupId> <groupId>com.mysql</groupId>
<artifactId>ojdbc8</artifactId> <artifactId>mysql-connector-j</artifactId>
<version>19.3.0.0.0</version> <version>9.2.0</version>
</dependency> </dependency>
<dependency> <dependency>
@ -113,9 +136,9 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
<version>3.7</version> <version>3.7</version>
</dependency> </dependency>
</dependencies> </dependencies>

34
code/backend/NewCitizenIdentify/src/main/java/com/cpic/xim/utils/newcitizen/NewCitizenUitls.java
View File

@ -1,11 +1,15 @@
/* /*
* @Author: Kane * @Author: Kane
*
* @Date: 2023-05-25 15:26:09 * @Date: 2023-05-25 15:26:09
*
* @LastEditors: Kane * @LastEditors: Kane
*
* @FilePath: /NewCitizenQueryResult/src/main/java/com/cpic/xim/utils/newcitizen/NewCitizenUitls.java * @FilePath: /NewCitizenQueryResult/src/main/java/com/cpic/xim/utils/newcitizen/NewCitizenUitls.java
*
* @Description: 新市民认证相关的工具方法 * @Description: 新市民认证相关的工具方法
* *
* Copyright (c) ${2022} by Kane, All Rights Reserved. * Copyright (c) ${2022} by Kane, All Rights Reserved.
*/ */
package com.cpic.xim.utils.newcitizen; package com.cpic.xim.utils.newcitizen;
@ -35,20 +39,22 @@ import com.fasterxml.jackson.databind.ObjectMapper;
public class NewCitizenUitls public class NewCitizenUitls
{ {
// 请求地址 // 请求地址
private static String identifyURL = "https://api.xmcic.cn:51888/government/economic/352"; private static String identifyURL = "https://api.xmcic.cn:8443/government/economic/352";
/** /**
* 新市民验证 * 新市民验证
*
* @param idCardNo 身份证号码 * @param idCardNo 身份证号码
* @param name 姓名 * @param name 姓名
* @return * @return
* @throws Exception * @throws Exception
*/ */
public static IdentifyResult identifyNewCitizen( String idCardNo, String name ) throws Exception public static IdentifyResult identifyNewCitizen( String idCardNo, String name )
throws Exception
{ {
String secretKey = EncryptionParameters.getSecretKey(); String secretKey = EncryptionParameters.getSecretKey();
String key = EncryptionParameters.getKey(); String key = EncryptionParameters.getKey();
String pushURL = "http://222.76.244.118:11101/NewCitizen/save_score.do"; String pushURL = "http://222.76.244.118:11101/NewCitizen/save_score.do";
Map<String, String> param = new HashMap<String, String>(); Map<String, String> param = new HashMap<String, String>();
@ -57,20 +63,20 @@ public class NewCitizenUitls
param.put( "name", EncryptionUtils.aesEncrypt( name, secretKey ) ); param.put( "name", EncryptionUtils.aesEncrypt( name, secretKey ) );
param.put( "pushurl", EncryptionUtils.aesEncrypt( pushURL, secretKey ) ); param.put( "pushurl", EncryptionUtils.aesEncrypt( pushURL, secretKey ) );
param.put( "timestamp", param.put( "timestamp",
EncryptionUtils.aesEncrypt( System.currentTimeMillis() + "", secretKey ) ); EncryptionUtils.aesEncrypt( System.currentTimeMillis() + "", secretKey ) );
String sign = SignUtils.sign( param ); String sign = SignUtils.sign( param );
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();
params.putAll( param ); params.putAll( param );
params.put( "key", key ); params.put( "key", key );
params.put( "sign", sign ); params.put( "sign", sign );
String resultJSON = sendPost( identifyURL, params ); String resultJSON = sendPost( identifyURL, params );
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
IdentifyResult identifyResult = null; IdentifyResult identifyResult = null;
ResponseResult response = null; ResponseResult response = null;
response = mapper.readValue( resultJSON, ResponseResult.class ); response = mapper.readValue( resultJSON, ResponseResult.class );
// 请求结果解密，应为一个json // 请求结果解密，应为一个json
@ -123,7 +129,8 @@ public class NewCitizenUitls
class ResponseResult class ResponseResult
{ {
public ResponseResult() public ResponseResult()
{} {
}
public String getCode() public String getCode()
{ {
@ -178,4 +185,3 @@ class ResponseResult
private String seqNo; private String seqNo;
} }

2
code/backend/NewCitizenIdentify/src/main/java/com/cpic/xim/web/controllers/NewCitizen/QueryResultController.java
View File

@ -10,7 +10,7 @@
package com.cpic.xim.web.controllers.NewCitizen; package com.cpic.xim.web.controllers.NewCitizen;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;

14
code/backend/NewCitizenIdentify/src/main/java/com/cpic/xim/web/filters/CrosFilter.java
View File

@ -11,13 +11,13 @@
package com.cpic.xim.web.filters; package com.cpic.xim.web.filters;
import java.io.IOException; import java.io.IOException;
import javax.servlet.Filter; import jakarta.servlet.Filter;
import javax.servlet.FilterChain; import jakarta.servlet.FilterChain;
import javax.servlet.ServletException; import jakarta.servlet.ServletException;
import javax.servlet.ServletRequest; import jakarta.servlet.ServletRequest;
import javax.servlet.ServletResponse; import jakarta.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
public class CrosFilter implements Filter public class CrosFilter implements Filter

13
code/backend/NewCitizenIdentify/src/main/webapp/WEB-INF/classes/spring.xml
View File

@ -17,21 +17,20 @@
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd"> http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd">
<context:component-scan base-package="com.cpic.xim" />
<mvc:annotation-driven /> <mvc:annotation-driven />
<context:component-scan base-package="com.cpic.xim" />
<mvc:default-servlet-handler /> <mvc:default-servlet-handler />
<!-- <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver"> <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
<property <property
name="prefix" value="/WEB-INF/jsp/" /> name="prefix" value="/WEB-INF/jsp/" />
<property name="suffix" value=".jsp" /> <property name="suffix" value=".jsp" />
</bean> --> </bean>
<bean id="multipartResolver" <!-- <bean id="multipartResolver"
class="org.springframework.web.multipart.commons.CommonsMultipartResolver"> class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
<property name="defaultEncoding" value="UTF-8" /> <property name="defaultEncoding" value="UTF-8" />
<property name="maxUploadSize" value="-1" /> <property name="maxUploadSize" value="-1" />
</bean> </bean> -->
</beans> </beans>