zhouwentao
/
ocr-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates

Browse Source
master
周文涛 2 years ago
parent 7d64a67859
commit 190db3d608
5 changed files with 57 additions and 36 deletions
Show Stats Download Patch File Download Diff File

15
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyDetailController.java
Unescape View File

@ -30,6 +30,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
@ -53,7 +54,10 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
public class OcrIdentifyDetailController extends JeecgController<OcrIdentifyDetail, IOcrIdentifyDetailService> {
@Autowired
private IOcrIdentifyDetailService ocrIdentifyDetailService;
//系统环境
@Value("${system.project.env}")
private String systemProjectEnv;
/**
* 分页列表查询
*
@ -79,6 +83,15 @@ public class OcrIdentifyDetailController extends JeecgController<OcrIdentifyDeta
if (StringUtils.isNotBlank(record.getMessage())) {
record.setMessages(Arrays.asList(record.getMessage().split("<br>")));
}
//图片.
if (StringUtils.isNotBlank(record.getImageUrl())&&"customer_test".equals(systemProjectEnv)) {
//客户测试服务器
if (!record.getImageUrl().contains("http:")&&!record.getImageUrl().contains("https:")) {
record.setImagePreviewUrl("http://47.103.213.109:8072/files"+record.getImageUrl());
}else{
record.setImagePreviewUrl(record.getImageUrl());
}
}
}
}
return Result.OK(pageList);

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrIdentifyDetail.java
Unescape View File

@ -89,4 +89,8 @@ public class OcrIdentifyDetail implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
@TableField(exist = false)
@ApiModelProperty(value = "图片预览地址")
private String imagePreviewUrl;
}

3
jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
Unescape View File

@ -296,3 +296,6 @@ third-app:
# appSecret
client-secret: ??
agent-id: ??
system:
project:
env: dev

5
jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml
Unescape View File

@ -300,4 +300,7 @@ third-app:
client-id: ??
# appSecret
client-secret: ??
agent-id: ??
agent-id: ??
system:
project:
env: customer_prod

66
jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml
Unescape View File

@ -1,5 +1,5 @@
server:
port: 8080
port: 8020
tomcat:
max-swallow-size: -1
error:
@ -7,7 +7,7 @@ server:
include-stacktrace: ALWAYS
include-message: ALWAYS
servlet:
context-path: /jeecg-boot
context-path: /ocr
compression:
enabled: true
min-response-size: 1024
@ -26,7 +26,7 @@ spring:
max-request-size: 10MB
mail:
host: smtp.163.com
username: ??
username: jeecgos@163.com
password: ??
properties:
mail:
@ -67,10 +67,10 @@ spring:
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
aop:
proxy-target-class: true
jpa:
open-in-view: false
aop:
proxy-target-class: true
#配置freemarker
freemarker:
# 设置模板后缀名
@ -118,7 +118,7 @@ spring:
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间，单位是毫秒
minEvictableIdleTimeMillis: 300000
validationQuery: SELECT 1 FROM DUAL
validationQuery: SELECT 1
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
@ -131,10 +131,14 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://47.103.213.109:3306/ocr?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: root
password: Wang5322570..
driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
# username: root
# password: root
# driver-class-name: com.mysql.cj.jdbc.Driver
# 多数据源配置
#multi-datasource1:
#url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
@ -143,8 +147,8 @@ spring:
#driver-class-name: com.mysql.cj.jdbc.Driver
#redis 配置
redis:
database: 0
host: 192.168.1.199
database: 2
host: 47.103.213.109
port: 6379
password: ''
#mybatis plus 设置
@ -154,13 +158,13 @@ mybatis-plus:
# 关闭MP3.0自带的banner
banner: false
db-config:
#主键类型
#主键类型 0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
id-type: ASSIGN_ID
# 默认数据库表下划线命名
table-underline: true
configuration:
# 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# 返回类型为Map,显示null对应的字段
call-setters-on-nulls: true
#jeecg专用配置
@ -173,7 +177,7 @@ jeecg:
signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
# 签名拦截接口
signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
# local\minio\alioss
#local、minio、alioss
uploadType: local
# 前端访问地址
domainUrl:
@ -181,9 +185,9 @@ jeecg:
app: http://localhost:8051
path:
#文件上传根目录 设置
upload: D://opt//upFiles
upload: /opt/upFiles
#webapp文件路径
webapp: D://opt//webapp
webapp: /opt/webapp
shiro:
excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
#阿里云oss存储和大鱼短信秘钥配置
@ -192,33 +196,24 @@ jeecg:
secretKey: ??
endpoint: oss-cn-beijing.aliyuncs.com
bucketName: jeecgdev
staticDomain: https://static.jeecg.com
# ElasticSearch 设置
# ElasticSearch 6设置
elasticsearch:
cluster-name: jeecg-ES
cluster-nodes: 81.70.47.128:9200
cluster-nodes: 127.0.0.1:9200
check-enabled: false
# 在线预览文件服务器地址配置
file-view-domain: http://127.0.0.1:8012
file-view-domain: http://fileview.jeecg.com
# minio文件上传
minio:
minio_url: http://minio.jeecg.com
minio_name: ??
minio_pass: ??
bucketName: ??
bucketName: otatest
#大屏报表参数设置
jmreport:
mode: prod
mode: dev
#数据字典是否进行saas数据隔离，自己看自己的字典
saas: false
#是否开启租户模式 Support By v1.5.5+
openTenant: false
#安全模式(敏感接口校验、saas模式下不允许使用平台数据源)
#safeMode: true
#是否需要校验token
is_verify_token: false
#必须校验方法
verify_methods: remove,delete,save,add,update
#xxl-job配置
xxljob:
enabled: false
@ -236,13 +231,13 @@ jeecg:
password:
type: STANDALONE
enabled: true
#cas单点登录
cas:
prefixUrl: http://cas.example.org:8443/cas
#Mybatis输出sql日志
logging:
level:
org.jeecg.modules.system.mapper: info
#cas单点登录
cas:
prefixUrl: http://cas.example.org:8443/cas
#swagger
knife4j:
#开启增强配置
@ -250,7 +245,7 @@ knife4j:
#开启生产环境屏蔽
production: false
basic:
enable: true
enable: false
username: jeecg
password: jeecg1314
#第三方登录
@ -300,4 +295,7 @@ third-app:
client-id: ??
# appSecret
client-secret: ??
agent-id: ??
agent-id: ??
system:
project:
env: customer_test
Write Preview
Loading…
Cancel
Save