服务参数配置

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/impl/FodderServiceImpl.java

@@ -115,7 +115,7 @@ public class FodderServiceImpl implements FodderService {
         // 超时回调
         Future<String> future = exec.submit(call);
         try {
-            String obj = future.get(10, TimeUnit.MINUTES); //任务处理超时时间设为 3分钟
+            String obj = future.get(20, TimeUnit.MINUTES); //任务处理超时时间设为 3分钟
             entity.setStatus(3);
             String tourXmlScene = this.getTourXmlScene(sceneCode);
             entity.setTour(tourXmlScene);

720yun_fd_consumer/run.sh

@@ -14,7 +14,7 @@ startApp(){
     	echo "程序已经在运行了"
     else
     	echo "执行 start 方法"
-    	nohup java -jar -Xmx3072M -Xms512M ./$APP_NAME --spring.profiles.active=$APP_EVN --server.port=$APP_PORT > logs.log 2>error.log &  # 说明pid为空
+    	nohup java -jar -XX:MetaspaceSize=1500m -XX:MaxMetaspaceSize=1500m -Xms4072m -Xmx4072m -Xmn1024m -Xss1m -XX:SurvivorRatio=8 ./$APP_NAME --spring.profiles.active=$APP_EVN --server.port=$APP_PORT > logs.log 2>error.log &  # 说明pid为空
 	echo Start Success!
 fi
 }

720yun_fd_manage/gis_application/src/main/resources/application-locSit.properties

@@ -7,15 +7,15 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.druid.password=root
 
 #sit
-spring.datasource.druid.url=jdbc:mysql://120.25.146.52:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.druid.username=root
-spring.datasource.druid.password=4dkk2020test%
+#spring.datasource.druid.url=jdbc:mysql://120.25.146.52:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+#spring.datasource.druid.username=root
+#spring.datasource.druid.password=4dkk2020test%
 
 
 #pro
-#spring.datasource.druid.url=jdbc:mysql://8.129.209.131:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-#spring.datasource.druid.username=root
-#spring.datasource.druid.password=4dkk2020cuikuan%
+spring.datasource.druid.url=jdbc:mysql://8.129.209.131:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.druid.username=root
+spring.datasource.druid.password=4dkk2020cuikuan%
 
 # \u521D\u59CB\u8FDE\u63A5\u6570
 spring.datasource.druid.initial-size=5
@@ -67,7 +67,7 @@ spring.redis.jedis.pool.max-wait=-1ms
 #spring.rabbitmq.password=guest
 
 # rabbitmq \u96C6\u7FA4\u6A21\u5F0F
-spring.rabbitmq.address=120.25.146.52:5672
+spring.rabbitmq.address=8.129.209.131:5672
 spring.rabbitmq.username=guest
 spring.rabbitmq.password=guest
 spring.rabbitmq.virtual-host=/

720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/RegexUtil.java

@@ -48,7 +48,6 @@ public class RegexUtil {
     public static String escapeChar(String before){
         if(StrUtil.isNotBlank(before)){
             before = before.replaceAll("\\\\", "\\\\\\\\");
-            before = before.replaceAll("_", "\\\\_");
             before = before.replaceAll("%", "\\\\%");
             before = before.replaceAll("'", "\\\\'");
         }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/FodderService.java

@@ -51,4 +51,6 @@ public interface FodderService extends IBaseService<FodderEntity, Long> {
     int getTodaySize(LocalDate today , String unit);
 
     Result handelRemove(Long id);
+
+    void reToQueue();
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/FodderServiceImpl.java

@@ -18,6 +18,7 @@ import com.gis.domain.dto.*;
 import com.gis.domain.entity.DirEntity;
 import com.gis.domain.entity.FodderEntity;
 import com.gis.domain.entity.WorkEntity;
+import com.gis.domain.entity.WorkHotsFodderEntity;
 import com.gis.domain.vo.FodderVo;
 import com.gis.mapper.FodderMapper;
 import com.gis.mapper.IBaseMapper;
@@ -716,4 +717,15 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
         }
         return null;
     }
+
+    @Override
+    public void reToQueue() {
+        Condition condition = new Condition(FodderEntity.class);
+        condition.createCriteria().andEqualTo("type", "pano").andEqualTo("status", "1");
+        List<FodderEntity> fodderEntities = getBaseMapper().selectByCondition(condition);
+        log.info("重新入队数量{}",fodderEntities.size());
+        for (FodderEntity fodderEntity : fodderEntities) {
+            rabbitTemplate.convertAndSend(RabbitConfig.PANO_EXCHANGE, RabbitConfig.PANO_QUEUE_ROUTING, fodderEntity.getId());
+        }
+    }
 }

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/TestController.java

@@ -7,6 +7,7 @@ import com.gis.common.util.Result;
 import com.gis.domain.dto.TestShDto;
 import com.gis.oss.util.AliYunOssUtil;
 import com.gis.oss.util.FileUtils;
+import com.gis.service.FodderService;
 import com.gis.service.TestService;
 import com.gis.task.VisitTask;
 import io.swagger.annotations.Api;
@@ -58,7 +59,8 @@ public class TestController extends BaseController {
     @Autowired
     AliYunOssUtil aliyunOssUtil;
 
-
+    @Autowired
+    FodderService fodderService;
 
 
 
@@ -294,7 +296,12 @@ public class TestController extends BaseController {
         return testService.updateToday();
     }
 
-
+    @ApiOperation(value = "reToQueue")
+    @GetMapping("/reToQueue")
+    public Result reToQueue()  {
+        fodderService.reToQueue();
+        return Result.success();
+    }
 
 
 

startJar.sh

@@ -46,7 +46,7 @@ start(){
     if [ $? -eq "0" ]; then    # [$? -eq "0"] 说明pid不等于空 说明服务正在运行中，将进程号打印出来
         echo "${APP_NAME} running. pid=${pid}"
     else
-        nohup java -jar -Xmx3072M -Xms512M ./$APP_NAME --spring.profiles.active=$1 --server.port=$APP_PORT > logs.log 2>error.log &  # 说明pid为空
+        nohup java -jar -XX:MetaspaceSize=1500m -XX:MaxMetaspaceSize=1500m -Xms4072m -Xmx4072m -Xmn1024m -Xss1m -XX:SurvivorRatio=8 ./$APP_NAME --spring.profiles.active=$1 --server.port=$APP_PORT > logs.log 2>error.log &  # 说明pid为空
         # 执行java -jar 命令启动服务
         echo "${APP_NAME} started启动"
     fi
@@ -108,7 +108,7 @@ restart(){
         if [ $? -eq "0" ]; then    # [$? -eq "0"] 说明pid不等于空 说明服务正在运行中，将进程号打印出来
             echo "${APP_NAME} running. pid=${pid}"
         else
-            nohup java -jar -Xmx3072M -Xms512M ./$APP_NAME --spring.profiles.active=$1 --server.port=$APP_PORT > logs.log 2>error.log &  # 说明pid为空 执行java -jar 命令启动服务
+            nohup java -jar -XX:MetaspaceSize=1500m -XX:MaxMetaspaceSize=1500m -Xms4072m -Xmx4072m -Xmn1024m -Xss1m -XX:SurvivorRatio=8 ./$APP_NAME --spring.profiles.active=$1 --server.port=$APP_PORT > logs.log 2>error.log &  # 说明pid为空 执行java -jar 命令启动服务
             echo "${APP_NAME} started启动"
         fi
 }