prod相关配置调整

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"));

jeecg-module-system/jeecg-system-biz/pom.xml

@@ -86,4 +86,23 @@
 			<version>1.0.3</version>
 		</dependency>
 	</dependencies>
+	<build>
+		<!-- 打包名称 -->
+		<finalName>${project.artifactId}</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>${maven-source-plugin.version}</version>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

jeecg-module-system/jeecg-system-start/pom.xml

@@ -31,6 +31,17 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <!--本地依赖的system作用域包打包到项目jar -->
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>

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
+    username: sw_mqtt
-    password: Mqtt@150326
+    password: 150326sw@
 
 #jeecg专用配置
 minidao:

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
+          url: jdbc:mysql://192.168.10.6:3306/zhst_finance?Unicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-          username: zhct_root
+          username: root
-          password: Xulei150326
+          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
+    address: 192.168.10.6:30007
-    ip: 127.0.0.1
+    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
+  activeKey: 86L1-11ZG-412Q-XKLB
-  libPath: jeecg-module-system\jeecg-system-api\jeecg-system-local-api\facelib
+  libPath: ./facelib
 detect:
   pool:
     size: 5

pom.xml

@@ -359,7 +359,15 @@
 						<nonFilteredFileExtension>eot</nonFilteredFileExtension>
 						<nonFilteredFileExtension>ttf</nonFilteredFileExtension>
 						<nonFilteredFileExtension>svg</nonFilteredFileExtension>
+						<!-- 人脸识别库，这里例外不编译 -->
+						<nonFilteredFileExtension>dll</nonFilteredFileExtension>
+						<nonFilteredFileExtension>so</nonFilteredFileExtension>
 					</nonFilteredFileExtensions>
+					<!-- 配置文件中使用了 @@占位符获取 maven 中的配置项idea 启动时报错-->
+					<delimiters>
+						<delimiter>@</delimiter>
+					</delimiters>
+					<useDefaultDelimiters>false</useDefaultDelimiters>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -376,6 +384,15 @@
 					<include>**/*.ftl</include>
 				</includes>
 			</resource>
+			<resource>
+				<directory>jeecg-module-system/jeecg-system-api/jeecg-system-local-api/facelib</directory>
+				<targetPath>facelib</targetPath>
+				<filtering>false</filtering>
+				<includes>
+					<include>*.dll</include>
+					<include>*.so</include>
+				</includes>
+			</resource>
 		</resources>
 	</build>
 	<!-- 环境 -->