dengsixing 1 ano atrás
pai
commit
f1c9c55cf3

+ 1 - 1
pom.xml

@@ -167,7 +167,7 @@
 <!--      </plugin>-->
 <!--    </plugins>-->
 
-    <finalName>model</finalName>
+    <finalName>convert</finalName>
 
     <plugins>
       <plugin>

+ 3 - 3
src/main/java/com/fdkankan/modeldemo/mq/ConvertListener.java

@@ -116,7 +116,7 @@ public class ConvertListener{
 //    }
 
     @RabbitListener(
-            queuesToDeclare = @Queue(Constant.QUEUE_SCENE_CONVERT + "-2"),
+            queuesToDeclare = @Queue(Constant.QUEUE_SCENE_CONVERT),
             concurrency = "1"
     )
     public void buildObjScenePreHandler(Channel channel, Message message) throws Exception {
@@ -229,8 +229,8 @@ public class ConvertListener{
         }
 
         if(dataSource != null){
-            FileUtil.del(dataSource);
-            FileUtil.del(dataSource.substring(0, dataSource.lastIndexOf("/")) + "_obj2txt");
+//            FileUtil.del(dataSource);
+//            FileUtil.del(dataSource.substring(0, dataSource.lastIndexOf("/")) + "_obj2txt");
         }
 
         sceneConvertLog.setTimeConsuming(String.valueOf(timeInterval.intervalSecond()));

+ 1 - 1
src/main/resources/application-dev.yml

@@ -23,7 +23,7 @@ spring:
 
 fdfs:
   sysCode: CT00017
-  address: http://10.180.22.83:8894
+  address: http://10.180.22.41:8761
   api:
     getSignature: /ChinatowerFileService/getSignature
     uploadFile: /ChinatowerFileService/uploadFile/

+ 37 - 0
src/main/resources/application-preprod.yml

@@ -0,0 +1,37 @@
+spring:
+  application:
+    name: 4dkankan-center-convert
+  rabbitmq:
+    host: 10.34.53.30
+    port: 5672
+    username: User_CHNTZCGL_ZCSZHGL_003
+    password: zcszhgl03_vr
+    virtual-host: Vhost_CHNTZCGL_ZCSZHGL_003
+    connection-timeout: 0
+    listener:
+      simple:
+        prefetch: 1
+        max-concurrency: 1
+        acknowledge-mode: manual #开启消费者手动确认
+    #开启消息投递确认机制
+    publisher-confirm-type: correlated
+  datasource:
+    url: jdbc:oracle:thin:@//10.38.52.243:1521/res
+    username: RES_VR
+    password: qawsed@123.
+    driver-class-name: oracle.jdbc.OracleDriver
+
+fdfs:
+  sysCode: CT00017
+  address: http://10.34.53.27:8761
+  api:
+    getSignature: /ChinatowerFileService/getSignature
+    uploadFile: /ChinatowerFileService/uploadFile/
+
+
+
+
+
+
+
+

+ 37 - 0
src/main/resources/application-prod.yml

@@ -0,0 +1,37 @@
+spring:
+  application:
+    name: 4dkankan-center-convert
+  rabbitmq:
+    host: 192.168.53.58
+    port: 5672
+    username: User_CHNTZCGL_ZCSZHGL_003
+    password: zcszhgl03_vr
+    virtual-host: Vhost_CHNTZCGL_ZCSZHGL_003
+    connection-timeout: 0
+    listener:
+      simple:
+        prefetch: 1
+        max-concurrency: 1
+        acknowledge-mode: manual #开启消费者手动确认
+    #开启消息投递确认机制
+    publisher-confirm-type: correlated
+  datasource:
+    url: jdbc:oracle:thin:@//192.168.29.122:1521/resdb
+    username: RES_VR
+    password: qawsed@123.
+    driver-class-name: oracle.jdbc.OracleDriver
+
+fdfs:
+  sysCode: CT00017
+  address: http://192.168.53.243:7356
+  api:
+    getSignature: /ChinatowerFileService/getSignature
+    uploadFile: /ChinatowerFileService/uploadFile/
+
+
+
+
+
+
+
+

+ 5 - 5
src/main/resources/application-test.yml

@@ -2,11 +2,11 @@ spring:
   application:
     name: 4dkankan-center-convert
   rabbitmq:
-    host: 10.190.22.108
+    host: 10.190.22.110
     port: 5672
-    username: User_CHNTZCGL_ZYAPP_002
-    password: ZYAPP002@VR
-    virtual-host: Vhost_CHNTZCGL_ZYAPP_002
+    username: User_CHNTZCGL_ZCSZHGL_003
+    password: zcszhgl03_vr
+    virtual-host: Vhost_CHNTZCGL_ZCSZHGL_003
     connection-timeout: 0
     listener:
       simple:
@@ -23,7 +23,7 @@ spring:
 
 fdfs:
   sysCode: CT00017
-  address: http://10.190.22.115:8894
+  address: http://10.190.22.106:8765
   api:
     getSignature: /ChinatowerFileService/getSignature
     uploadFile: /ChinatowerFileService/uploadFile/

+ 2 - 3
src/main/resources/application.yml

@@ -1,3 +1,2 @@
-spring:
-  profiles:
-    active: test
+server:
+  port: 10083

+ 1 - 1
src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
 
 	<contextName>logback</contextName>
 	<!-- name的值是变量的名称,value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后,可以使“${}”来使用变量。 -->
-	<property name="log.path" value="/mnt/docker/4dkankan/model/logs" />
+	<property name="log.path" value="/app/4dkankan/convert/logs" />
 
 	<!-- 彩色日志 -->
 	<!-- 彩色日志依赖的渲染类 -->