1.青浦民营公交分支

王通
1 parent 9f82216c
Showing 11 changed files with 17 additions and 17 deletions
pom.xml
src/main/resources/application-prod.properties
src/main/resources/datatools/config-prod.properties
src/main/resources/ms-jdbc.properties
src/main/resources/static/index.html
src/main/resources/static/login.html
src/main/resources/static/pages/control/line/index.html
src/main/resources/static/real_control_v2/main.html
src/main/resources/static/real_control_v2_mobile/main.html
src/main/resources/static/real_control_v2_mobile/sch_manage/sch_imitate.html
src/main/resources/traffic-jdbc.properties
@@ -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>
@@ -2,7 +2,7 @@ server.port=9088
 management.port= 9001
 management.address= 127.0.0.1
-dubbo.use=true
+dubbo.use=false
 spring.jpa.hibernate.ddl-auto= none
 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
@@ -10,9 +10,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.40.100:3306/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://112.64.148.30:54002/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= root@JSP2jsp
+spring.datasource.password= Aa123456
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
@@ -26,6 +26,6 @@ spring.datasource.test-while-idle=true
 spring.datasource.validation-query=select 1
 ## gateway real data
-http.gps.real.url= http://192.168.40.82:8080/transport_server/rtgps/
+http.gps.real.url= http://10.3.30.4:14004/transport_server/rtgps/
 ## gateway send directive
-http.send.directive = http://192.168.40.82:8080/transport_server/message/
+http.send.directive = http://10.3.30.4:14004/transport_server/message/
@@ -5,11 +5,11 @@ datatools.kettle_properties=/datatools/kettle.properties
 # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
 #数据库ip地址
-datatools.kvars_dbip=192.168.40.100
+datatools.kvars_dbip=112.64.148.30
 #数据库用户名
 datatools.kvars_dbuname=root
 #数据库密码
-datatools.kvars_dbpwd=root@JSP2jsp
+datatools.kvars_dbpwd=Aa123456
 #数据库库名
 datatools.kvars_dbdname=qp_control
@@ -4,6 +4,6 @@
 #ms.mysql.password= 123456
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://192.168.40.82:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://112.64.148.30:54002/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
-ms.mysql.password= 123456
+ms.mysql.password= Aa123456
@@ -220,7 +220,7 @@
 		<!-- LOGO -->
 		<div class="page-logo">
 			<a href="index.html" class="logo-default logo-default-text">
-				青浦公交调度系统 </a>
+				调度系统 </a>
 			<div class="menu-toggler sidebar-toggler"></div>
 		</div>
 		<!-- END LOGO -->
@@ -181,7 +181,7 @@
 <div class="wrapper ng-scope">
     <div id="loginPanel" class="dialog dialog-shadow">
         <br>
-        <h3 class="logo-text">青浦公交调度系统</h3>
+        <h3 class="logo-text">调度系统</h3>
         <hr>
         <form style="padding: 0px 35px;">
             <div class="form-group" style="margin-bottom: 0">
@@ -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> 
@@ -59,7 +59,7 @@
         <div class="uk-width-4-10">
             <div class="uk-panel">
                 <h2 class="north-logo">
-                    <!--<i class="uk-icon-life-ring"></i>--> 青浦公交线路调度
+                    <!--<i class="uk-icon-life-ring"></i>--> 线路调度
                 </h2>
             </div>
         </div>
@@ -56,7 +56,7 @@
         <div class="uk-width-4-10">
             <div class="uk-panel">
                 <h2 class="north-logo">
-                    <!--<i class="uk-icon-life-ring"></i>--> 青浦公交线路调度
+                    <!--<i class="uk-icon-life-ring"></i>--> 线路调度
                 </h2>
             </div>
         </div>
@@ -164,7 +164,7 @@
         <div class="uk-width-4-10">
             <div class="uk-panel">
                 <h2 class="north-logo" style="color: #f1f1f1;">
-                    <i class="uk-icon-life-ring"></i> 青浦公交线路调度班次管理
+                    <i class="uk-icon-life-ring"></i> 线路调度班次管理
                 </h2>
             </div>
         </div>
@@ -6,4 +6,4 @@
 ms.mysql.driver= com.mysql.jdbc.Driver
 ms.mysql.url= jdbc:mysql://192.168.40.82:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
-ms.mysql.password= 123456
+ms.mysql.password= Aa123456