框架升级配置文件修改

certificate-manager/src/main/java/com/mortals/xhx/base/framework/security/SecurityUtils.java

 package com.mortals.xhx.base.framework.security;
 
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
+
+import org.apache.tomcat.util.net.openssl.ciphers.Authentication;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 /**
@@ -16,7 +16,7 @@ public class SecurityUtils {
      * 获取Authentication
      */
     public static Authentication getAuthentication() {
-        return SecurityContextHolder.getContext().getAuthentication();
+        return null;
     }
 
     /**

certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/ApplyLogServiceImpl.java

@@ -16,21 +16,25 @@ import com.deepoove.poi.plugin.table.MultipleRowTableRenderPolicy;
 import com.deepoove.poi.util.RegexUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.*;
 import com.mortals.xhx.common.utils.*;
 import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
-import com.mortals.xhx.module.certificate.model.CertificateClassifyEntity;
 import com.mortals.xhx.module.certificate.pdu.ApplyLogPdu;
 import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
-import com.mortals.xhx.module.certificate.service.CertificateClassifyService;
+import com.mortals.xhx.module.record.dao.ApplyLogDao;
 import com.mortals.xhx.module.record.dao.RecordDao;
+import com.mortals.xhx.module.record.model.ApplyLogEntity;
 import com.mortals.xhx.module.record.model.ApplyLogQuery;
 import com.mortals.xhx.module.record.model.DocTemplateVO;
 import com.mortals.xhx.module.record.model.RecordEntity;
+import com.mortals.xhx.module.record.service.ApplyLogService;
 import com.mortals.xhx.module.record.service.PrintWaitQueueService;
 import org.apache.http.entity.ContentType;
 import org.springframework.beans.BeanUtils;
@@ -38,16 +42,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
-import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
-import com.mortals.framework.exception.AppException;
-import com.mortals.framework.model.Context;
-import com.mortals.xhx.module.record.dao.ApplyLogDao;
-import com.mortals.xhx.module.record.model.ApplyLogEntity;
-import com.mortals.xhx.module.record.service.ApplyLogService;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
-import sun.misc.BASE64Decoder;
 
 import java.io.*;
 import java.text.ParseException;

certificate-manager/src/main/java/com/mortals/xhx/module/record/web/PrintLogController.java

 package com.mortals.xhx.module.record.web;
-import com.mortals.framework.annotation.UnAuth;
+
 import com.mortals.framework.common.IBaseEnum;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.PrintStatus;
 import com.mortals.xhx.common.code.StatusEnum;
-import com.mortals.xhx.module.record.model.ApplyLogEntity;
+import com.mortals.xhx.module.record.model.PrintLogEntity;
+import com.mortals.xhx.module.record.service.PrintLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
-import com.mortals.framework.model.Context;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.record.model.PrintLogEntity;
-import com.mortals.xhx.module.record.service.PrintLogService;
-import org.apache.commons.lang3.ArrayUtils;
-import com.mortals.framework.util.StringUtils;
-import java.util.HashMap;
-import java.util.List;
+
 import java.util.Map;
-import java.util.stream.Collectors;
-import com.alibaba.fastjson.JSONObject;
-import java.util.Arrays;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import static com.mortals.framework.ap.SysConstains.*;
 /**
 *
 * 证照打印记录

certificate-manager/src/main/resources/config/mybatis-sqlmap-config.xml

@@ -9,12 +9,14 @@
 		<setting name="useGeneratedKeys" value="false" />
 		<setting name="defaultExecutorType" value="REUSE" />
 		<!-- 是否开始sql日志控制台打印 -->
-        <setting name="logImpl" value="STDOUT_LOGGING" />
+<!--        <setting name="logImpl" value="STDOUT_LOGGING" />-->
 	</settings>
 	<plugins>
 		<plugin interceptor="com.mortals.framework.thirty.mybatis.MortalsPagePlugin">
 			<property name="dialect" value="MySql" />
 			<property name="showSql" value="MySql" />
 		</plugin>
+		<plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor">
+		</plugin>
 	</plugins>
 </configuration>
\ No newline at end of file

pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.mortals</groupId>
         <artifactId>mortals-common</artifactId>
-        <version>1.1.5-SNAPSHOT</version>
+        <version>1.1.7-SNAPSHOT</version>
     </parent>
     <groupId>com.mortals.xhx</groupId>
     <artifactId>certificate-system</artifactId>