111

src/main/java/com/fdkankan/Application.java

@@ -28,7 +28,7 @@ public class Application implements CommandLineRunner {
 
     @Override
     public void run(String... args) throws Exception {
-//        convertService.scenePushHistory();
+        convertService.scenePushHistory();
     }
 }
 

src/main/java/com/fdkankan/project/tieta/controller/ConvertController.java

@@ -72,6 +72,14 @@ public class ConvertController {
 
     @GetMapping("/deleteRedisKey")
     public ResultData deleteRedisKey(){
+        redisClient.del("scene:convert:history:41012201000233_000102050000000002520351");
+        redisClient.del("scene:convert:history:110106908000001067_001102050200000038732428");
+        redisClient.del("scene:convert:history:110115908000001104_000102050000000000079651");
+        redisClient.del("scene:convert:history:111104500010001366_500102050000000000216719");
+        redisClient.del("scene:convert:history:111401500010001724_500102050000000000285799");
+        redisClient.del("scene:convert:history:410100908000000130_004102050200000038765224");
+        redisClient.del("scene:convert:history:410100908000000218_004102050200000038758205");
+        redisClient.del("scene:convert:history:410183908000000694_000102050000000000751059");
         return ResultData.ok();
 
     }

src/main/java/com/fdkankan/project/tieta/receiver/RabbitMqListener.java

@@ -1,43 +0,0 @@
-package com.fdkankan.project.tieta.receiver;
-
-import com.fdkankan.project.tieta.constant.Constant;
-import com.rabbitmq.client.Channel;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.Queue;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.stereotype.Component;
-
-import java.nio.charset.StandardCharsets;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/4/20
- **/
-@Slf4j
-@Component
-public class RabbitMqListener {
-
-    /**
-     * 场景计算
-     * @param channel
-     * @param message
-     * @throws Exception
-     */
-    @RabbitListener(
-            queuesToDeclare = @Queue(Constant.QUEUE_SCENE_CONVERT),
-            concurrency = "1",
-            priority = "1"
-    )
-    public void buildSceneHandler(Channel channel, Message message) throws Exception {
-        long deliveryTag = message.getMessageProperties().getDeliveryTag();
-        String msg = new String(message.getBody(), StandardCharsets.UTF_8);
-        System.out.println("msg:" + msg);
-        channel.basicAck(deliveryTag, false);
-    }
-
-}

src/main/java/com/fdkankan/redis/util/RedisClient.java

@@ -20,6 +20,8 @@ public class RedisClient {
 
     public final static String url_str_get = "/redis/string/get/";
 
+    public final static String url_str_del = "/redis/string/delete";
+
     @Value("${redis.host}")
     private String host;
 
@@ -55,6 +57,17 @@ public class RedisClient {
         return jsonObject.getString("data");
     }
 
+    public String del(String key){
+        String url = host + url_str_del;
+        Map<String, Object> params = new HashMap<>();
+        params.put("key", this.genKey(key));
+        JSONObject jsonObject = httpClient.postJson(url, params);
+        if(Objects.isNull(jsonObject) || !"0".equals(jsonObject.getString("status"))){
+            throw new RuntimeException("redis del string error");
+        }
+        return jsonObject.getString("data");
+    }
+
     private String genKey(String key){
          return sysCode + "_" + serverName + "_" + key;
     }

src/main/resources/application-dev.yml

@@ -16,7 +16,7 @@ spring:
     #开启消息投递确认机制
     publisher-confirm-type: correlated
   datasource:
-    url: jdbc:oracle:thin:@//10.190.107.148:1521/resdb
+    url: jdbc:oracle:thin:@//10.180.41.37:1521/resdb
     username: RES_FILE
     password: qNQVkH3YbA
     driver-class-name: oracle.jdbc.OracleDriver
@@ -31,7 +31,7 @@ tieta:
 
 fdfs:
   sysCode: CT00017
-  address: http://10.180.22.83:8894
+  address: http://10.180.22.41:8761
   api:
     getSignature: /ChinatowerFileService/getSignature
     uploadFile: /ChinatowerFileService/uploadFile/

src/main/resources/application-preprod.yml

@@ -0,0 +1,46 @@
+spring:
+  application:
+    name: 4dkankan-project-tieta
+  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
+mybatis-plus:
+  mapper-locations: classpath:mapper/*Mapper.xml
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+tieta:
+  sysCode: CT00017
+  serverName: vrpush
+
+fdfs:
+  sysCode: CT00017
+  address: http://10.34.53.27:8761
+  api:
+    getSignature: /ChinatowerFileService/getSignature
+    uploadFile: /ChinatowerFileService/uploadFile/
+
+redis:
+  host: http://10.34.53.34:8081
+
+
+
+
+
+

src/main/resources/application-prod.yml

@@ -0,0 +1,46 @@
+spring:
+  application:
+    name: 4dkankan-project-tieta
+  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
+mybatis-plus:
+  mapper-locations: classpath:mapper/*Mapper.xml
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+tieta:
+  sysCode: CT00017
+  serverName: vrpush
+
+fdfs:
+  sysCode: CT00017
+  address: http://192.168.53.243:7356
+  api:
+    getSignature: /ChinatowerFileService/getSignature
+    uploadFile: /ChinatowerFileService/uploadFile/
+
+redis:
+  host: http://192.168.53.243:8081
+
+
+
+
+
+

src/main/resources/application-test.yml

@@ -16,7 +16,7 @@ spring:
     #开启消息投递确认机制
     publisher-confirm-type: correlated
   datasource:
-    url: jdbc:oracle:thin:@//10.190.107.148:1521/resdb
+    url: jdbc:oracle:thin:@//10.180.41.37:1521/resdb
     username: RES_FILE
     password: qNQVkH3YbA
     driver-class-name: oracle.jdbc.OracleDriver
@@ -31,7 +31,7 @@ tieta:
 
 fdfs:
   sysCode: CT00017
-  address: http://10.190.22.115:8894
+  address: http://10.190.22.106:8765
   api:
     getSignature: /ChinatowerFileService/getSignature
     uploadFile: /ChinatowerFileService/uploadFile/

src/main/resources/application.yml

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

src/main/resources/logback-spring.xml

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