diff --git a/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/JwtAuthenticationFilter.java b/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/JwtAuthenticationFilter.java index 6724ea76..3abdfc81 100644 --- a/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/JwtAuthenticationFilter.java +++ b/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/JwtAuthenticationFilter.java @@ -58,15 +58,19 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter { String[] excludespath = systemopenurlService.getOpenUrl(); //不需要过滤的url - String[] excludesOther = {"/static","/json",".js",".css",".ico",".jpg",".png",".pcm","/","/druid"}; + String[] excludesOther = {"/static","/json",".js",".css",".ico",".jpg",".png",".pcm","/druid"}; String[] urls = ArrayUtils.addAll(excludespath, excludesOther); boolean flag = true; - for (String str : urls) { - if (spath.indexOf(str) != -1) { - flag =false; - break; + if("/".equalsIgnoreCase(spath)) { + flag = false; + }else{ + for (String str : urls) { + if (spath.indexOf(str) != -1) { + flag = false; + break; + } } } if(flag){ diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml index a48c199f..3c21119f 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml @@ -168,7 +168,8 @@ select tcp.* from ( select tc.* from ocr_taskchild_picture tc,OA_USERFINAL_T uf - where tc.ID = uf.FORMID and uf.USERID ${thisLoginUserid.dataOp} ${thisLoginUserid.likestar}#{thisLoginUserid.value}${thisLoginUserid.likeend} + where tc.ID = uf.FORMID + and uf.USERID ${thisLoginUserid.dataOp} ${thisLoginUserid.likestar}#{thisLoginUserid.value}${thisLoginUserid.likeend} UNION select tc.* @@ -188,7 +189,8 @@ select tcp.* from ( select tc.* from ocr_taskchild_picture tc,OA_USERFINAL_T uf - where tc.ID = uf.FORMID and uf.USERID ${thisLoginUserid.dataOp} ${thisLoginUserid.likestar}#{thisLoginUserid.value}${thisLoginUserid.likeend} + where tc.ID = uf.FORMID + and uf.USERID ${thisLoginUserid.dataOp} ${thisLoginUserid.likestar}#{thisLoginUserid.value}${thisLoginUserid.likeend} UNION select tc.* diff --git a/runstart/src/main/resources/application-dev.yml b/runstart/src/main/resources/application-dev.yml index bcc138c3..6f88ffcb 100644 --- a/runstart/src/main/resources/application-dev.yml +++ b/runstart/src/main/resources/application-dev.yml @@ -23,10 +23,10 @@ spring: primary: master datasource: master: - url: jdbc:mysql://127.0.0.1:3306/ocr?useUnicode=true&nullCatalogMeansCurrent=true&characterEncoding=UTF-8&characterSetResults=utf8&serverTimezone=Asia/Shanghai&useSSL=false + url: jdbc:mysql://47.93.59.251:3306/ocrnew?useUnicode=true&nullCatalogMeansCurrent=true&characterEncoding=UTF-8&characterSetResults=utf8&serverTimezone=Asia/Shanghai&useSSL=false driver-class-name: com.mysql.cj.jdbc.Driver - username: jyjz - password: jyjz + username: ysltest + password: ysltest2024. type: com.alibaba.druid.pool.DruidDataSource slave: url: jdbc:mysql://127.0.0.1:3306/ocr?useUnicode=true&nullCatalogMeansCurrent=true&characterEncoding=UTF-8&characterSetResults=utf8&serverTimezone=Asia/Shanghai&useSSL=false @@ -104,7 +104,7 @@ flowable: deployment-api-url: http://127.0.0.1:9090/foodapi/flowable-task/app-api #关闭定时任务JOB async-executor-activate: false - database-schema-update: true + database-schema-update: false # # cache: # type: redis @@ -140,7 +140,7 @@ flowable: mybatis: mapper-locations: - classpath*:mapper/**/*.xml -# - classpath*:/META-INF/modeler-mybatis-mappings/*.xml + # - classpath*:/META-INF/modeler-mybatis-mappings/*.xml configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl configuration-properties: @@ -161,15 +161,15 @@ mybatis-plus: xiaoyao: web: #上传文件路径 - uploadPath: D:/ideaWork/jeecg/ocrproject/htmlweb/upload + uploadPath: X:/project3/2024_ai_gd/ocr/htmlweb/upload #页面根路径 - frontPath: D:/ideaWork/jeecg/ocrproject/htmlweb + frontPath: X:/project3/2024_ai_gd/ocr/htmlweb #js、css、图片存放路径 - staticPath: D:/ideaWork/jeecg/ocrproject/htmlweb/static + staticPath: X:/project3/2024_ai_gd/ocr/htmlweb/static #页面模版路径 - webPath: D:/ideaWork/jeecg/ocrproject/htmlweb/web + webPath: X:/project3/2024_ai_gd/ocr/htmlweb/web #Lucene索引路径 - lucenePath: D:/ideaWork/jeecg/ocrproject/htmlweb/lucene/indexDir + lucenePath: X:/project3/2024_ai_gd/ocr/htmlweb/lucene/indexDir #是否开启flowable haveFlowable: true webconfig: @@ -272,4 +272,4 @@ springfox: swagger-ui: enabled: true # 是否启用swagger,postman调试 -debugger_tools: true \ No newline at end of file +debugger_tools: true