From 77aafd3a78ebe8d820dedb7035f327bfdd48f45a Mon Sep 17 00:00:00 2001
From: chenhui <22166243@qq.com>
Date: Thu, 14 Mar 2024 14:17:55 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=85=81=E8=AE=B8=E5=8C=BF=E5=90=8D?=
=?UTF-8?q?=E8=AE=BF=E9=97=AE=E5=9C=B0=E5=9D=80=EF=BC=8C=E6=8E=92=E6=9F=A5?=
=?UTF-8?q?/=E6=A8=A1=E7=B3=8A=E5=8C=B9=E9=85=8D=EF=BC=8C=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=A5=E6=A0=BC=E7=9B=B8=E7=AD=89=202?=
=?UTF-8?q?=E3=80=81=E8=A7=A3=E5=86=B3=E7=BB=88=E5=AE=A1=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=AE=A1=E7=90=86=E5=91=98=E6=8A=A5=E9=94=99?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../JwtAuthenticationFilter.java | 14 +++++++-----
.../mapper/oa/OcrTaskchildPictureMapper.xml | 6 +++--
.../src/main/resources/application-dev.yml | 22 +++++++++----------
3 files changed, 24 insertions(+), 18 deletions(-)
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 6724ea7..3abdfc8 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 a48c199..3c21119 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 bcc138c..6f88ffc 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