Jelajahi Sumber

配置修改

pra 3 tahun lalu
induk
melakukan
e2a471daa6

+ 7 - 5
.idea/compiler.xml

@@ -7,25 +7,26 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="swagger-bootstrap-ui" />
         <module name="tofly-zmrq" />
         <module name="common-log" />
         <module name="tofly-flowable" />
         <module name="tofly-zmrqgps" />
         <module name="common-es" />
-        <module name="common-schedule" />
         <module name="base-api" />
-        <module name="tofly-getway" />
+        <module name="swagger-bootstrap-ui" />
         <module name="monitor-center" />
         <module name="base-service" />
         <module name="common-core" />
         <module name="common-mq" />
+        <module name="tofly-zmrqchedule" />
         <module name="tofly-zmrqcar" />
+        <module name="common-websocket" />
         <module name="tofly-eureka" />
-        <module name="tofly-auth" />
         <module name="common-oauth" />
+        <module name="tofly-auth" />
+        <module name="common-schedule" />
         <module name="common-interface" />
-        <module name="common-websocket" />
+        <module name="tofly-getway" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
@@ -51,6 +52,7 @@
       <module name="tofly-monitor" target="1.8" />
       <module name="tofly-zmrq" target="1.8" />
       <module name="tofly-zmrqcar" target="1.8" />
+      <module name="tofly-zmrqchedule" target="1.8" />
       <module name="tofly-zmrqgps" target="1.8" />
     </bytecodeTargetLevel>
   </component>

+ 2 - 0
.idea/encodings.xml

@@ -32,6 +32,8 @@
     <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/zmrqGps/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/zmrqGps/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/zmrqSchedule/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/zmrqSchedule/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/zmrqcar/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/zmrqcar/src/main/resources" charset="UTF-8" />
   </component>

+ 2 - 0
.idea/misc.xml

@@ -9,6 +9,8 @@
         <option value="$PROJECT_DIR$/zmrqGps/pom.xml" />
         <option value="$PROJECT_DIR$/tofly-framwork2.0/tofly-base/pom.xml" />
         <option value="$PROJECT_DIR$/../zmrq-f/tofly-framwork2.0/pom.xml" />
+        <option value="$PROJECT_DIR$/dyrqSchedule/pom.xml" />
+        <option value="$PROJECT_DIR$/zmrqSchedule/pom.xml" />
       </list>
     </option>
   </component>

+ 1 - 0
.idea/modules.xml

@@ -24,6 +24,7 @@
       <module fileurl="file://$PROJECT_DIR$/../zmrq-f/tofly-framwork2.0/tofly-monitor/tofly-monitor.iml" filepath="$PROJECT_DIR$/../zmrq-f/tofly-framwork2.0/tofly-monitor/tofly-monitor.iml" />
       <module fileurl="file://$PROJECT_DIR$/tofly-zmrq.iml" filepath="$PROJECT_DIR$/tofly-zmrq.iml" />
       <module fileurl="file://$PROJECT_DIR$/zmrqcar/tofly-zmrqcar.iml" filepath="$PROJECT_DIR$/zmrqcar/tofly-zmrqcar.iml" />
+      <module fileurl="file://$PROJECT_DIR$/zmrqSchedule/tofly-zmrqchedule.iml" filepath="$PROJECT_DIR$/zmrqSchedule/tofly-zmrqchedule.iml" />
       <module fileurl="file://$PROJECT_DIR$/zmrqGps/tofly-zmrqgps.iml" filepath="$PROJECT_DIR$/zmrqGps/tofly-zmrqgps.iml" />
     </modules>
   </component>

+ 5 - 4
zmrqGps/src/main/resources/bootstrap-loc.yml

@@ -10,7 +10,8 @@ eureka:
     hostname: 192.168.2.174
   client:
     service-url:
-      defaultZone: http://192.168.2.248:${EUREKAPORT:9999}/eureka/
+#      defaultZone: http://192.168.2.248:${EUREKAPORT:9999}/eureka/
+      defaultZone: http://112.51.249.202:${EUREKAPORT:9999}/eureka/
 spring:
   application:
     name: tofly-dyrqgpspra
@@ -33,11 +34,11 @@ spring:
     allow-bean-definition-overriding: true
   # 数据源
   datasource:
-    url: jdbc:oracle:thin:@192.168.2.242:1521/orcl
+    url: jdbc:oracle:thin:@36.137.119.21:1521/zmgis
     driver-class-name: oracle.jdbc.OracleDriver
     #    driver-class-name: oracle.jdbc.driver.OracleDriver
-    username: tf_zmrq
-    password: tf_zmrq
+    username: zmrq
+    password: zmrq
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       initial-size: 10

+ 5 - 4
zmrqGps/target/classes/bootstrap-loc.yml

@@ -10,7 +10,8 @@ eureka:
     hostname: 192.168.2.174
   client:
     service-url:
-      defaultZone: http://192.168.2.248:${EUREKAPORT:9999}/eureka/
+#      defaultZone: http://192.168.2.248:${EUREKAPORT:9999}/eureka/
+      defaultZone: http://112.51.249.202:${EUREKAPORT:9999}/eureka/
 spring:
   application:
     name: tofly-dyrqgpspra
@@ -33,11 +34,11 @@ spring:
     allow-bean-definition-overriding: true
   # 数据源
   datasource:
-    url: jdbc:oracle:thin:@192.168.2.242:1521/orcl
+    url: jdbc:oracle:thin:@36.137.119.21:1521/zmgis
     driver-class-name: oracle.jdbc.OracleDriver
     #    driver-class-name: oracle.jdbc.driver.OracleDriver
-    username: tf_zmrq
-    password: tf_zmrq
+    username: zmrq
+    password: zmrq
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       initial-size: 10