diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FileShowUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FileShowUtil.java index 8504bb2..de80d5f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FileShowUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FileShowUtil.java @@ -77,6 +77,9 @@ public class FileShowUtil { if (StringUtils.isEmpty(path)) { return getIntranet()+"default.png"; } + if(path.contains("yyjk.cqygjk.com")){ + return path; + } if(path.contains("https") || path.contains("http")){ if(path.contains("temp")){ path = path.substring(path.indexOf("temp")); diff --git a/jeecg-module-system/jeecg-system-biz/pom.xml b/jeecg-module-system/jeecg-system-biz/pom.xml index f2e72c7..b2617dc 100644 --- a/jeecg-module-system/jeecg-system-biz/pom.xml +++ b/jeecg-module-system/jeecg-system-biz/pom.xml @@ -86,4 +86,23 @@ 1.0.3 + + + ${project.artifactId} + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} + + + attach-sources + + jar + + + + + + diff --git a/jeecg-module-system/jeecg-system-start/pom.xml b/jeecg-module-system/jeecg-system-start/pom.xml index d7b08dd..a03a9a3 100644 --- a/jeecg-module-system/jeecg-system-start/pom.xml +++ b/jeecg-module-system/jeecg-system-start/pom.xml @@ -31,6 +31,17 @@ org.springframework.boot spring-boot-maven-plugin + + + true + + + + + repackage + + + diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index 238d1ff..e6eb845 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -133,8 +133,8 @@ mybatis-plus: activemq: device: brokerUrl: failover:(tcp://127.0.0.1:61616,tcp://127.0.0.1:61616)?randomize=false&priorityBackup=true&maxReconnectDelay=1000&startupMaxReconnectAttempts=3 - username: mtqquser - password: Mqtt@150326 + username: sw_mqtt + password: 150326sw@ #jeecg专用配置 minidao: diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml index aedd627..52b5365 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml @@ -35,7 +35,7 @@ spring: downloadPath: #内网 # intranet: http://192.168.10.223:8888/ - intranet: http://192.168.1.16:8888/ + intranet: http://192.168.10.6:8888/ #外网 == 暂时没有用 outernet: https://vip.shuziweidao.com/appPackage/ #配置freemarker @@ -97,9 +97,9 @@ spring: connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://rm-uf6afe85n7b0l6034eo.mysql.rds.aliyuncs.com:3306/zhst_finance?Unicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai - username: zhct_root - password: Xulei150326 + url: jdbc:mysql://192.168.10.6:3306/zhst_finance?Unicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai + username: root + password: 123qwe!@#P@ssw0rd driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 #multi-datasource1: @@ -110,9 +110,9 @@ spring: #redis 配置 redis: database: 2 - host: r-bp100u5p8za5xul8y3pd.redis.rds.aliyuncs.com + host: 192.168.10.6 port: 6379 - password: 'zhct:Xulei150326' + password: 123qwe!@#P@ssw0rd #mybatis plus 设置 mybatis-plus: mapper-locations: classpath*:org/jeecg/**/**/**/xml/*Mapper.xml @@ -132,7 +132,7 @@ mybatis-plus: #消息队列配置 activemq: device: - brokerUrl: failover:(tcp://device.shuziweidao.com:1883,tcp://127.0.0.1:1883)?randomize=false&priorityBackup=true&maxReconnectDelay=1000&startupMaxReconnectAttempts=3 + brokerUrl: failover:(tcp://device.shuziweidao.com:1883,tcp://192.168.10.6:61616)?randomize=false&priorityBackup=true&maxReconnectDelay=1000&startupMaxReconnectAttempts=3 username: sw_mqtt password: 150326sw@ @@ -159,7 +159,7 @@ jeecg: #服务部署的外网ip端口、域名地址：用于下载文件 serverPublicIp: # 文件访问地址 需配置 - ip: http://192.168.1.16:2333 + ip: http://192.168.10.6:2333 path: #文件上传根目录 设置 需配置 upload: /opt/upFiles @@ -176,10 +176,10 @@ jeecg: # ElasticSearch 6设置 elasticsearch: cluster-name: jeecg-ES - cluster-nodes: 127.0.0.1:9200 + cluster-nodes: 192.168.10.6:9200 check-enabled: false # 在线预览文件服务器地址配置 - file-view-domain: 127.0.0.1:8012 + file-view-domain: 192.168.10.6:8012 # minio文件上传 minio: minio_url: http://minio.jeecg.com @@ -198,11 +198,11 @@ jeecg: #xxl-job配置 xxljob: enabled: false - adminAddresses: http://127.0.0.1:9080/xxl-job-admin + adminAddresses: http://192.168.10.6:9080/xxl-job-admin appname: ${spring.application.name} accessToken: '' - address: 127.0.0.1:30007 - ip: 127.0.0.1 + address: 192.168.10.6:30007 + ip: 192.168.10.6 port: 30007 logPath: logs/jeecg/job/jobhandler/ logRetentionDays: 30 @@ -291,8 +291,8 @@ face: # windows appId: 3RX8bPDaEx3ZLYrxKEZ9F8hT5cqTma49AoeQhTMW8Wvg sdkKey: CsNxFiPekJAyuQRjwY3c918ARVEEyCyzuvmMwWDUAjsF - activeKey: 86L1-11ZG-411K-8WAF - libPath: jeecg-module-system\jeecg-system-api\jeecg-system-local-api\facelib + activeKey: 86L1-11ZG-412Q-XKLB + libPath: ./facelib detect: pool: size: 5 diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/facelib/arcsoft-sdk-face-4.1.1.0.jar b/jeecg-module-system/jeecg-system-start/src/main/resources/facelib/arcsoft-sdk-face-4.1.1.0.jar new file mode 100644 index 0000000..c49fe45 Binary files /dev/null and b/jeecg-module-system/jeecg-system-start/src/main/resources/facelib/arcsoft-sdk-face-4.1.1.0.jar differ diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/facelib/libarcsoft_face.dll b/jeecg-module-system/jeecg-system-start/src/main/resources/facelib/libarcsoft_face.dll new file mode 100644 index 0000000..d0a4c97 Binary files /dev/null and b/jeecg-module-system/jeecg-system-start/src/main/resources/facelib/libarcsoft_face.dll differ diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/facelib/libarcsoft_face_engine.dll b/jeecg-module-system/jeecg-system-start/src/main/resources/facelib/libarcsoft_face_engine.dll new file mode 100644 index 0000000..db65b00 Binary files /dev/null and b/jeecg-module-system/jeecg-system-start/src/main/resources/facelib/libarcsoft_face_engine.dll differ diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/facelib/libarcsoft_face_engine_jni.dll b/jeecg-module-system/jeecg-system-start/src/main/resources/facelib/libarcsoft_face_engine_jni.dll new file mode 100644 index 0000000..0266b32 Binary files /dev/null and b/jeecg-module-system/jeecg-system-start/src/main/resources/facelib/libarcsoft_face_engine_jni.dll differ diff --git a/pom.xml b/pom.xml index 3c7a530..f260ef6 100644 --- a/pom.xml +++ b/pom.xml @@ -359,7 +359,15 @@ eot ttf svg + + dll + so + + + @ + + false @@ -376,6 +384,15 @@ **/*.ftl + + jeecg-module-system/jeecg-system-api/jeecg-system-local-api/facelib + facelib + false + + *.dll + *.so + +