潘钊 / bsth_control · Commits

Commit e1ecfac08f427e8e1454cd3eb872060afd6fcc29

Authored by 王通
1 parent e0f56e12
build: skipped

1.

Inline Side-by-side
Showing 9 changed files with 55 additions and 47 deletions
... ... @@ -5,7 +5,7 @@
5 5 <groupId>com.bsth</groupId>
6 6 <artifactId>bsth_control</artifactId>
7 7 <version>0.0.1-SNAPSHOT</version>
8   - <packaging>war</packaging>
  8 + <packaging>jar</packaging>
9 9  
10 10 <parent>
11 11 <groupId>org.springframework.boot</groupId>
... ... @@ -319,24 +319,6 @@
319 319 <version>1.1.8</version>
320 320 </dependency>
321 321  
322   - <!-- dubbo 需要的jar start -->
323   - <dependency>
324   - <groupId>com.alibaba</groupId>
325   - <artifactId>dubbo</artifactId>
326   - <!--<version>2.6.3</version>-->
327   - <version>2.5.3</version>
328   - <exclusions>
329   - <exclusion>
330   - <groupId>org.springframework</groupId>
331   - <artifactId>spring</artifactId>
332   - </exclusion>
333   - <exclusion>
334   - <groupId>log4j</groupId>
335   - <artifactId>log4j</artifactId>
336   - </exclusion>
337   - </exclusions>
338   - </dependency>
339   -
340 322 <dependency>
341 323 <groupId>org.apache.zookeeper</groupId>
342 324 <artifactId>zookeeper</artifactId>
... ... @@ -446,10 +428,23 @@
446 428 <version>1.5.3</version>
447 429 </dependency>
448 430  
  431 + <!-- 核心依赖 -->
  432 + <dependency>
  433 + <groupId>org.bytedeco</groupId>
  434 + <artifactId>javacv</artifactId>
  435 + <version>1.5.5</version>
  436 + </dependency>
  437 + <dependency>
  438 + <groupId>org.bytedeco</groupId>
  439 + <artifactId>javacpp</artifactId>
  440 + <version>1.5.5</version>
  441 + </dependency>
  442 + <!-- Linux x86_64平台特定的FFmpeg依赖 -->
449 443 <dependency>
450 444 <groupId>org.bytedeco</groupId>
451   - <artifactId>javacv-platform</artifactId>
452   - <version>1.5.11</version>
  445 + <artifactId>ffmpeg</artifactId>
  446 + <version>4.3.2-1.5.5</version>
  447 + <classifier>${javacpp.platform}</classifier>
453 448 </dependency>
454 449 </dependencies>
455 450  
... ... @@ -475,6 +470,26 @@
475 470 <target>1.8</target>
476 471 </configuration>
477 472 </plugin>
  473 +<!-- <plugin>-->
  474 +<!-- <groupId>net.roseboy</groupId>-->
  475 +<!-- <artifactId>classfinal-maven-plugin</artifactId>-->
  476 +<!-- <version>1.2.1</version>-->
  477 +<!-- <configuration>-->
  478 +<!-- <password>bsth@369147258</password>-->
  479 +<!-- <packages>com.bsth</packages>-->
  480 +<!-- <cfgfiles>application*.properties</cfgfiles>-->
  481 +<!-- <excludes>org.spring</excludes>-->
  482 +<!-- <libjars></libjars>-->
  483 +<!-- </configuration>-->
  484 +<!-- <executions>-->
  485 +<!-- <execution>-->
  486 +<!-- <phase>package</phase>-->
  487 +<!-- <goals>-->
  488 +<!-- <goal>classFinal</goal>-->
  489 +<!-- </goals>-->
  490 +<!-- </execution>-->
  491 +<!-- </executions>-->
  492 +<!-- </plugin>-->
478 493 <plugin>
479 494 <artifactId>maven-war-plugin</artifactId>
480 495 <configuration>
... ... @@ -523,5 +538,7 @@
523 538  
524 539 <properties>
525 540 <start-class>com.bsth.Application</start-class>
  541 + <!-- 平台配置，只打包Linux x86_64平台的jar包 -->
  542 + <javacpp.platform>linux-x86_64</javacpp.platform>
526 543 </properties>
527 544 </project>
... ...
src/main/resources/application-cloud.properties
  View file @e1ecfac
... ... @@ -14,9 +14,9 @@ spring.jpa.properties.hibernate.dialect= org.hibernate.spatial.dialect.mysql.MyS
14 14  
15 15 #DATABASE control
16 16 spring.datasource.control.driver-class-name= com.mysql.cj.jdbc.Driver
17   -spring.datasource.control.jdbc-url= jdbc:mysql://127.0.0.1/control_dy?useUnicode=true&characterEncoding=utf-8&useSSL=false
18   -spring.datasource.control.username= schedule
19   -spring.datasource.control.password= fsodlgjiuigAQF2$9fs9
  17 +spring.datasource.control.jdbc-url= jdbc:mysql://192.168.168.152/control_dy?useUnicode=true&characterEncoding=utf-8&useSSL=false
  18 +spring.datasource.control.username= root
  19 +spring.datasource.control.password= root2jsp
20 20 spring.datasource.control.type= com.zaxxer.hikari.HikariDataSource
21 21 #DATASOURCE
22 22 spring.datasource.control.minimum-idle= 8
... ... @@ -31,9 +31,9 @@ spring.datasource.control.register-mbeans=false
31 31  
32 32 #DATABASE info-publish
33 33 spring.datasource.info-publish.driver-class-name= com.mysql.cj.jdbc.Driver
34   -spring.datasource.info-publish.jdbc-url= jdbc:mysql://127.0.0.1/info_publish?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
35   -spring.datasource.info-publish.username= schedule
36   -spring.datasource.info-publish.password= fsodlgjiuigAQF2$9fs9
  34 +spring.datasource.info-publish.jdbc-url= jdbc:mysql://192.168.168.152/info_publish?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
  35 +spring.datasource.info-publish.username= root
  36 +spring.datasource.info-publish.password= root2jsp
37 37 spring.datasource.info-publish.type= com.zaxxer.hikari.HikariDataSource
38 38 #DATASOURCE
39 39 spring.datasource.info-publish.minimum-idle= 8
... ... @@ -48,9 +48,9 @@ spring.datasource.info-publish.register-mbeans=false
48 48  
49 49 #DATABASE ms
50 50 spring.datasource.ms.driver-class-name= com.mysql.cj.jdbc.Driver
51   -spring.datasource.ms.jdbc-url= jdbc:mysql://127.0.0.1/ms?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
52   -spring.datasource.ms.username= schedule
53   -spring.datasource.ms.password= fsodlgjiuigAQF2$9fs9
  51 +spring.datasource.ms.jdbc-url= jdbc:mysql://192.168.168.152/ms?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
  52 +spring.datasource.ms.username= root
  53 +spring.datasource.ms.password= root2jsp
54 54 spring.datasource.ms.type= com.zaxxer.hikari.HikariDataSource
55 55 #DATASOURCE
56 56 spring.datasource.ms.minimum-idle= 8
... ... @@ -64,7 +64,7 @@ spring.datasource.ms.validation-timeout= 3000
64 64 spring.datasource.ms.register-mbeans=false
65 65  
66 66 kafka.use= false
67   -spring.kafka.consumer.bootstrap-servers= 127.0.0.1:9092
  67 +spring.kafka.consumer.bootstrap-servers= 192.168.168.152:9092
68 68 spring.kafka.key-serializer= org.apache.kafka.common.serialization.StringSerializer
69 69 spring.kafka.value-serializer= org.apache.kafka.common.serialization.StringSerializer
70 70 spring.kafka.producer.buffer-memory= 33554432
... ...
src/main/resources/application.properties
  View file @e1ecfac
1   -spring.profiles.active = dev
  1 +spring.profiles.active = cloud
2 2  
3 3 spring.view.suffix=.html
4 4 server.session-timeout=-1
... ...
src/main/resources/datatools/config-cloud.properties
  View file @e1ecfac
... ... @@ -4,15 +4,6 @@
4 4 datatools.kettle_properties=/datatools/kettle.properties
5 5 # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
6 6  
7   -#数据库ip地址
8   -datatools.kvars_dbip=10.10.154.20
9   -#数据库用户名
10   -datatools.kvars_dbuname=root
11   -#数据库密码
12   -datatools.kvars_dbpwd=root2jsp
13   -#数据库库名
14   -datatools.kvars_dbdname=control_dy
15   -
16 7 # 3、上传数据配置信息
17 8 # 上传文件目录配置（根据不同的环境需要修正）
18 9 datatools.fileupload_dir=/home/bsth_control_u_d_files
... ...
src/main/resources/logback.xml
  View file @e1ecfac
... ... @@ -354,7 +354,7 @@
354 354  
355 355 <!-- 日志输出级别 -->
356 356 <root level="info">
357   -<!-- <appender-ref ref="STDOUT" />-->
  357 + <appender-ref ref="STDOUT" />
358 358 <appender-ref ref="FILE" />
359 359 </root>
360 360 </configuration>
... ...
src/main/resources/ms-jdbc.properties
  View file @e1ecfac
... ... @@ -4,6 +4,6 @@
4 4 #ms.mysql.password= 123456
5 5  
6 6 ms.mysql.driver= com.mysql.cj.jdbc.Driver
7   -ms.mysql.url= jdbc:mysql://127.0.0.1/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
8   -ms.mysql.username= schedule
9   -ms.mysql.password= fsodlgjiuigAQF2$9fs9
10 7 \ No newline at end of file
  8 +ms.mysql.url= jdbc:mysql://192.168.168.152/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
  9 +ms.mysql.username= root
  10 +ms.mysql.password= root2jsp
11 11 \ No newline at end of file
... ...
src/main/resources/static/favicon.ico
View file @e1ecfac
No preview for this file type
src/main/resources/static/login.html
  View file @e1ecfac
... ... @@ -221,7 +221,7 @@
221 221 <div class="alert alert-danger"></div>
222 222 </div>
223 223  
224   - <div class="login-footer">© 2024 成都公交集团新城市巴士有限公司 Some Rights
  224 + <div class="login-footer">© 2025 峨眉山市公共汽车有限责任公司 Some Rights
225 225 Reserved</div>
226 226 </div>
227 227  
... ...
src/main/resources/static/pages/control/line/index.html
  View file @e1ecfac
... ... @@ -18,7 +18,7 @@
18 18 <div class="portlet-title banner" >
19 19 <div class="caption col_hide_1280" style="color: #FFF;">
20 20 <i class="fa fa-life-ring" style="font-size: 22px;color: #FFF;"></i> <span
21   - class="caption-subject bold" style="font-size: 24px;">新城市线路调度系统</span>
  21 + class="caption-subject bold" style="font-size: 24px;">峨眉线路调度系统</span>
22 22 </div>
23 23 <div class="col_hide_1440" style="color: white;font-size: 18px;position: absolute;right: 25px;top: 75px;">
24 24 <span class="top_username"></span> <span class="operation_mode_text animated" ></span>
... ...