入库日志修改

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/CodeYymc/CodeYymc.java → common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/CodeYymc/SkCodeYymc.java

@@ -13,8 +13,8 @@ import java.io.Serializable;
  *  code_yymc（字典表）
  */
 @Data
-@ApiModel("code_yymc")
-public class CodeYymc implements Serializable {
+@ApiModel("sk_code_yymc")
+public class SkCodeYymc implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

common/service_base/src/main/java/com/founder/servicebase/config/TokenConfig.java

@@ -26,7 +26,7 @@ public class TokenConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         String[] excludePatterns = new String[]{"/swagger-resources/**", "/webjars/**", "/v2/**", "/swagger-ui.html/**",
-                "/api", "/api-docs", "/api-docs/**", "/doc.html/**", "/koTime/**","/code/codeAdd"};
+                "/api", "/api-docs", "/api-docs/**", "/doc.html/**", "/koTime/**"};
         registry.addInterceptor(tokenInterceptor)
                 .addPathPatterns("/**")//指定该类拦截的url
                 .excludePathPatterns(skInterceptorController.findAllUrl())

common/service_base/src/main/java/com/founder/servicebase/interceptor/TokenInterceptor.java

@@ -7,7 +7,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.founder.commonutils.Exception.TokenException;
 import com.founder.commonutils.model.newPublicEntity.*;
-import com.founder.commonutils.model.newPublicEntity.CodeYymc.CodeYymc;
+import com.founder.commonutils.model.newPublicEntity.CodeYymc.SkCodeYymc;
 import com.founder.commonutils.model.newPublicEntity.CodeYymc.SysYhczrz;
 import com.founder.commonutils.util.*;
 import com.founder.servicebase.mapper.mysqlMapper.CodeYymcMapper;
@@ -23,7 +23,6 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.util.*;
 
@@ -88,6 +87,7 @@ public class TokenInterceptor implements HandlerInterceptor {
         String thirdauthorization = JwtUser.getHeadToken(request, "thirdauthorization");
         String str = "";
         System.out.println(request.getRequestURL());
+        System.out.println(request.getRequestURL().toString());
         if (thirdauthorization != null && !"".equals(thirdauthorization)) {//有thirdauthorization，第三方登录
             Claims claims = null;
             flag = false;
@@ -130,6 +130,9 @@ public class TokenInterceptor implements HandlerInterceptor {
                     Token token = new Token(object);
                     System.out.println(token);
                     str = verifyToken(request,token);
+                    if (request.getRequestURL().toString().contains("/code/codeAdd") || request.getRequestURL().toString().contains("/code/yymcSelect")){
+                        return true;
+                    }
                     if (str.equals("")) {
                         Enumeration<String> headerNames = request.getHeaderNames();
                         while(headerNames.hasMoreElements()){//如果请求头中还有key
@@ -245,7 +248,7 @@ public class TokenInterceptor implements HandlerInterceptor {
 //        根据code去查询对应名称;
         QueryWrapper wrapper = new QueryWrapper<>();
         wrapper.eq("code",logcode);
-        CodeYymc codeYymc = codeYymcMapper.selectOne(wrapper);
+        SkCodeYymc skCodeYymc = codeYymcMapper.selectOne(wrapper);
 
         SysUser user = (SysUser)request.getAttribute("user");
         SysYhczrz sysYhczrz = new SysYhczrz();
@@ -254,11 +257,11 @@ public class TokenInterceptor implements HandlerInterceptor {
         sysYhczrz.setYhdwGajgmc(user.getUnitname());
         sysYhczrz.setYhXm(user.getTrueName());
         sysYhczrz.setYhIp(user.getIp());
-        sysYhczrz.setYymcJyqk(codeYymc.getName());
+        sysYhczrz.setYymcJyqk(skCodeYymc.getName());
         sysYhczrz.setYymcdm(logcode);
-        sysYhczrz.setCzlxdm(codeYymc.getCzlxdm());
+        sysYhczrz.setCzlxdm(skCodeYymc.getCzlxdm());
         try {
-            if (codeYymc.getCzlxdm().equals("05")){
+            if (skCodeYymc.getCzlxdm().equals("05")){
                 sysYhczrz.setCzxxParam(null);
             }
             //get  或者  post multipart/form-data格式
@@ -288,7 +291,7 @@ public class TokenInterceptor implements HandlerInterceptor {
             throw new RuntimeException(e);
         }
 
-        sysYhczrz.setCzlx(codeYymc.getCzlx());
+        sysYhczrz.setCzlx(skCodeYymc.getCzlx());
 
         sysYhczrz.setXxdjryXm(user.getLrr());
         sysYhczrz.setXxczryGmsfhm(user.getIdentitycard());

common/service_base/src/main/java/com/founder/servicebase/mapper/mysqlMapper/CodeYymcMapper.java

 package com.founder.servicebase.mapper.mysqlMapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.founder.commonutils.model.newPublicEntity.CodeYymc.CodeYymc;
+import com.founder.commonutils.model.newPublicEntity.CodeYymc.SkCodeYymc;
 
-public interface CodeYymcMapper extends BaseMapper<CodeYymc> {
+public interface CodeYymcMapper extends BaseMapper<SkCodeYymc> {
 }

service/publicapi/src/main/resources/bootstrap-dev.properties

@@ -112,7 +112,7 @@ management.endpoint.logfile.enabled=true
 management.endpoint.logfile.external-file= /data2/skglpt/publicapi1003.log
 
 #\u662F\u5426\u5F00\u542Fpowerjob
-powerjob.worker.enabled=true
+powerjob.worker.enabled=false
 # akka \u5DE5\u4F5C\u7AEF\u53E3\uFF0C\u53EF\u9009\uFF0C\u9ED8\u8BA4 27778
 powerjob.worker.akka-port=27778
 # \u63A5\u5165\u5E94\u7528\u540D\u79F0\uFF0C\u7528\u4E8E\u5206\u7EC4\u9694\u79BB\uFF0C\u63A8\u8350\u586B\u5199 \u672C Java \u9879\u76EE\u540D\u79F0