1.

王通
1 parent e0f56e12
Showing 9 changed files with 55 additions and 47 deletions
pom.xml
src/main/resources/application-cloud.properties
src/main/resources/application.properties
src/main/resources/datatools/config-cloud.properties
src/main/resources/logback.xml
src/main/resources/ms-jdbc.properties
src/main/resources/static/favicon.ico
src/main/resources/static/login.html
src/main/resources/static/pages/control/line/index.html
@@ -5,7 +5,7 @@
 	<groupId>com.bsth</groupId>
 	<artifactId>bsth_control</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>war</packaging>
+	<packaging>jar</packaging>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -319,24 +319,6 @@
 			<version>1.1.8</version>
 		</dependency>
-        <!-- dubbo 需要的jar start -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>dubbo</artifactId>
-            <!--<version>2.6.3</version>-->
-            <version>2.5.3</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
@@ -446,10 +428,23 @@
 			<version>1.5.3</version>
 		</dependency>
+		<!-- 核心依赖 -->
+		<dependency>
+			<groupId>org.bytedeco</groupId>
+			<artifactId>javacv</artifactId>
+			<version>1.5.5</version>
+		</dependency>
+		<dependency>
+			<groupId>org.bytedeco</groupId>
+			<artifactId>javacpp</artifactId>
+			<version>1.5.5</version>
+		</dependency>
+		<!-- Linux x86_64平台特定的FFmpeg依赖 -->
 		<dependency>
 			<groupId>org.bytedeco</groupId>
-			<artifactId>javacv-platform</artifactId>
-			<version>1.5.11</version>
+			<artifactId>ffmpeg</artifactId>
+			<version>4.3.2-1.5.5</version>
+			<classifier>${javacpp.platform}</classifier>
 		</dependency>
 	</dependencies>
@@ -475,6 +470,26 @@
 					<target>1.8</target>
 				</configuration>
 			</plugin>
+<!--			<plugin>-->
+<!--				<groupId>net.roseboy</groupId>-->
+<!--				<artifactId>classfinal-maven-plugin</artifactId>-->
+<!--				<version>1.2.1</version>-->
+<!--				<configuration>-->
+<!--					<password>bsth@369147258</password>-->
+<!--					<packages>com.bsth</packages>-->
+<!--					<cfgfiles>application*.properties</cfgfiles>-->
+<!--					<excludes>org.spring</excludes>-->
+<!--					<libjars></libjars>-->
+<!--				</configuration>-->
+<!--				<executions>-->
+<!--					<execution>-->
+<!--						<phase>package</phase>-->
+<!--						<goals>-->
+<!--							<goal>classFinal</goal>-->
+<!--						</goals>-->
+<!--					</execution>-->
+<!--				</executions>-->
+<!--			</plugin>-->
 			<plugin>
 				<artifactId>maven-war-plugin</artifactId>
 				<configuration>
@@ -523,5 +538,7 @@
 	<properties>
 		<start-class>com.bsth.Application</start-class>
+		<!-- 平台配置，只打包Linux x86_64平台的jar包 -->
+		<javacpp.platform>linux-x86_64</javacpp.platform>
 	</properties>
 </project>
@@ -14,9 +14,9 @@ spring.jpa.properties.hibernate.dialect= org.hibernate.spatial.dialect.mysql.MyS
 #DATABASE control
 spring.datasource.control.driver-class-name= com.mysql.cj.jdbc.Driver
-spring.datasource.control.jdbc-url= jdbc:mysql://127.0.0.1/control_dy?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.control.username= schedule
-spring.datasource.control.password= fsodlgjiuigAQF2$9fs9
+spring.datasource.control.jdbc-url= jdbc:mysql://192.168.168.152/control_dy?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.control.username= root
+spring.datasource.control.password= root2jsp
 spring.datasource.control.type= com.zaxxer.hikari.HikariDataSource
 #DATASOURCE
 spring.datasource.control.minimum-idle= 8
@@ -31,9 +31,9 @@ spring.datasource.control.register-mbeans=false
 #DATABASE info-publish
 spring.datasource.info-publish.driver-class-name= com.mysql.cj.jdbc.Driver
-spring.datasource.info-publish.jdbc-url= jdbc:mysql://127.0.0.1/info_publish?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.info-publish.username= schedule
-spring.datasource.info-publish.password= fsodlgjiuigAQF2$9fs9
+spring.datasource.info-publish.jdbc-url= jdbc:mysql://192.168.168.152/info_publish?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.info-publish.username= root
+spring.datasource.info-publish.password= root2jsp
 spring.datasource.info-publish.type= com.zaxxer.hikari.HikariDataSource
 #DATASOURCE
 spring.datasource.info-publish.minimum-idle= 8
@@ -48,9 +48,9 @@ spring.datasource.info-publish.register-mbeans=false
 #DATABASE ms
 spring.datasource.ms.driver-class-name= com.mysql.cj.jdbc.Driver
-spring.datasource.ms.jdbc-url= jdbc:mysql://127.0.0.1/ms?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.ms.username= schedule
-spring.datasource.ms.password= fsodlgjiuigAQF2$9fs9
+spring.datasource.ms.jdbc-url= jdbc:mysql://192.168.168.152/ms?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.ms.username= root
+spring.datasource.ms.password= root2jsp
 spring.datasource.ms.type= com.zaxxer.hikari.HikariDataSource
 #DATASOURCE
 spring.datasource.ms.minimum-idle= 8
@@ -64,7 +64,7 @@ spring.datasource.ms.validation-timeout= 3000
 spring.datasource.ms.register-mbeans=false
 kafka.use= false
-spring.kafka.consumer.bootstrap-servers= 127.0.0.1:9092
+spring.kafka.consumer.bootstrap-servers= 192.168.168.152:9092
 spring.kafka.key-serializer= org.apache.kafka.common.serialization.StringSerializer
 spring.kafka.value-serializer= org.apache.kafka.common.serialization.StringSerializer
 spring.kafka.producer.buffer-memory= 33554432
-spring.profiles.active = dev
+spring.profiles.active = cloud
 spring.view.suffix=.html
 server.session-timeout=-1
@@ -4,15 +4,6 @@
 datatools.kettle_properties=/datatools/kettle.properties
 # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
-#数据库ip地址
-datatools.kvars_dbip=10.10.154.20
-#数据库用户名
-datatools.kvars_dbuname=root
-#数据库密码
-datatools.kvars_dbpwd=root2jsp
-#数据库库名
-datatools.kvars_dbdname=control_dy
-
 # 3、上传数据配置信息
 # 上传文件目录配置（根据不同的环境需要修正）
 datatools.fileupload_dir=/home/bsth_control_u_d_files
@@ -354,7 +354,7 @@
 	<!-- 日志输出级别 -->
 	<root level="info">
-<!--		<appender-ref ref="STDOUT" />-->
+		<appender-ref ref="STDOUT" />
 		<appender-ref ref="FILE" />
 	</root>
 </configuration>
@@ -4,6 +4,6 @@
 #ms.mysql.password= 123456
 ms.mysql.driver= com.mysql.cj.jdbc.Driver
-ms.mysql.url= jdbc:mysql://127.0.0.1/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
-ms.mysql.username= schedule
-ms.mysql.password= fsodlgjiuigAQF2$9fs9
 \ No newline at end of file
+ms.mysql.url= jdbc:mysql://192.168.168.152/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ms.mysql.username= root
+ms.mysql.password= root2jsp
 \ No newline at end of file
@@ -221,7 +221,7 @@
         <div class="alert alert-danger"></div>
     </div>
-    <div class="login-footer">© 2024 成都公交集团新城市巴士有限公司 Some Rights
+    <div class="login-footer">© 2025 峨眉山市公共汽车有限责任公司 Some Rights
         Reserved</div>
 </div>
@@ -18,7 +18,7 @@
     <div class="portlet-title banner" >
         <div class="caption col_hide_1280" style="color: #FFF;">
 			<i class="fa fa-life-ring" style="font-size: 22px;color: #FFF;"></i> <span
-				class="caption-subject bold" style="font-size: 24px;">新城市线路调度系统</span>
+				class="caption-subject bold" style="font-size: 24px;">峨眉线路调度系统</span>
 		</div>
 		<div class="col_hide_1440" style="color: white;font-size: 18px;position: absolute;right: 25px;top: 75px;">
 			<span class="top_username"></span> <span class="operation_mode_text animated" ></span>