lyhzzz 2 years ago
parent
commit
9d4298cf41

+ 0 - 3
src/main/java/com/fdkankan/tools/service/ITbSceneProService.java

@@ -18,7 +18,4 @@ import java.util.List;
 public interface ITbSceneProService extends IService<TbScenePro> {
 
 
-    List<TbScenePro> getByNumList(List<String> numList);
-
-    List<TbScenePro> saveDb(List<ScenePro> scenePros, List<SceneProEdit> sceneProEdits, String zfbPhone, String zfbSnCode);
 }

+ 0 - 88
src/main/java/com/fdkankan/tools/service/impl/TbSceneProServiceImpl.java

@@ -30,92 +30,4 @@ import java.util.stream.Collectors;
 @Slf4j
 public class TbSceneProServiceImpl extends ServiceImpl<ITbSceneProMapper, TbScenePro> implements ITbSceneProService {
 
-
-    @Value("${db1.fyun.host}")
-    private String db1Host;
-    @Value("${db2.fyun.host}")
-    private String db2Host;
-    @Value("${db1.main}")
-    private String db1main;
-    @Value("${db2.main}")
-    private String db2main;
-
-    @Autowired
-    ITbUserService tbUserService;
-    @Autowired
-    ITbCameraInstanceService tbCameraInstanceService;
-    @Autowired
-    ITbSceneProEditService tbSceneProEditService;
-
-
-    @Override
-    public List<TbScenePro> getByNumList(List<String> numList) {
-        if(numList.size() >0){
-            LambdaQueryWrapper<TbScenePro> wrapper = new LambdaQueryWrapper<>();
-            wrapper.in(TbScenePro::getNum,numList);
-            return this.list(wrapper);
-        }
-      return new ArrayList<>();
-    }
-
-
-
-    @Override
-    public List<TbScenePro> saveDb(List<ScenePro> scenePros, List<SceneProEdit> sceneProEdits, String zfbPhone, String zfbSnCode) {
-
-        TbUser tbUser = tbUserService.getByUserName(zfbPhone);
-        if(tbUser == null){
-            log.info("db2-user-not-exist--zfbPhone:{}",zfbPhone);
-            return null;
-        }
-        TbCameraInstance cameraInstance = tbCameraInstanceService.getBySnCode(zfbSnCode);
-        if(cameraInstance == null){
-            log.info("db2-cameraInstance-not-exist--zfbSnCode:{}",zfbSnCode);
-            return null;
-        }
-        HashMap<Long,SceneProEdit> editMap = new HashMap<>();
-        sceneProEdits.forEach(entity -> editMap.put(entity.getProId(),entity));
-
-        List<String> numList = scenePros.stream().map(ScenePro::getNum).collect(Collectors.toList());
-
-        List<TbScenePro> zfbSceneList = this.getByNumList(numList);
-        HashMap<String,TbScenePro> tbMap = new HashMap<>();
-        zfbSceneList.forEach(entity -> tbMap.put(entity.getNum(),entity));
-
-        List<String> zfbNumList = zfbSceneList.stream().map(TbScenePro::getNum).collect(Collectors.toList());
-        List<TbScenePro> list = new ArrayList<>();
-        for (ScenePro scenePro : scenePros) {
-            if(zfbNumList.contains(scenePro.getNum())){
-                log.info("zfb-db-exist:num:{}",scenePro.getNum());
-                TbScenePro tbScenePro = tbMap.get(scenePro.getNum());
-                if(tbScenePro == null){
-                    log.info("zfb-db-map-noexist:num:{}",scenePro.getNum());
-                    continue;
-                }
-                list.add(tbScenePro);
-                continue;
-            }
-            TbScenePro tbScenePro = new TbScenePro();
-            BeanUtils.copyProperties(scenePro,tbScenePro);
-            tbScenePro.setWebSite(scenePro.getWebSite().replaceAll(db1main,db2main));
-            tbScenePro.setVideos(scenePro.getVideos().replaceAll(db1main,db2main));
-            tbScenePro.setId(null);
-            tbScenePro.setUserId(tbUser.getId());
-            tbScenePro.setCameraId(cameraInstance.getId());
-            tbScenePro.setDataSource(scenePro.getDataSource());
-            tbScenePro.setStatus(0);
-            this.save(tbScenePro);
-            list.add(tbScenePro);
-
-
-            SceneProEdit sceneProEdit = editMap.get(scenePro.getId());
-            TbSceneProEdit tbSceneProEdit = new TbSceneProEdit();
-            BeanUtils.copyProperties(sceneProEdit,tbSceneProEdit);
-            tbSceneProEdit.setId(null);
-            tbSceneProEdit.setProId(tbScenePro.getId());
-            tbSceneProEditService.save(tbSceneProEdit);
-
-        }
-        return list;
-    }
 }

+ 2 - 34
src/main/resources/application-new-prod.yaml

@@ -15,38 +15,6 @@ spring:
       username: root
       password: zfb@20210727%
 
-#源
-fyun2:
-  aws:
-    s3key: AKIAWCV5QFZ3ZNELKYUY
-    s3secrey: epS5ghyR4LJ7rxk/qJO9ZYh6m9Oz6g5haKDu4yws
-    s3bucket: 4dkankan
-  oss:
-    key: LTAIUrvuHqj8pvry
-    secrey: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
-    bucket: 4dkankan
-    #公网 point: http://oss-cn-shenzhen.aliyuncs.com
-    #内网 point: http://oss-cn-shenzhen-internal.aliyuncs.com
-    point: http://oss-cn-shenzhen.aliyuncs.com
-#目标
-fyun:
-  aws:
-    s3key: AKIAWCV5QFZ3ZNELKYUY
-    s3secrey: epS5ghyR4LJ7rxk/qJO9ZYh6m9Oz6g5haKDu4yws
-    s3bucket: 4dkankan
-  oss:
-    key: LTAIUrvuHqj8pvry
-    secrey: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
-    bucket: zfb-4dkankan
-    point: http://oss-cn-shenzhen.aliyuncs.com
-
-db1:
-  fyun:
-    host: https://4dkk.4dage.com
-  main: https://www.4dkankan.com
-
-db2:
-  fyun:
-    host: https://4dkk.4dage.com
-  main: https://zfb.4dkankan.com
 
+logging:
+  path: /home/data-zfb

+ 2 - 33
src/main/resources/application-old-prod.yaml

@@ -16,38 +16,7 @@ spring:
       url: jdbc:mysql://47.112.166.173:3306/zhi_house?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
       username: root
       password: 4dkankan4dage
-#源
-fyun2:
-  aws:
-    s3key: AKIAWCV5QFZ3ZNELKYUY
-    s3secrey: epS5ghyR4LJ7rxk/qJO9ZYh6m9Oz6g5haKDu4yws
-    s3bucket: 4dkankan
-  oss:
-    key: LTAIUrvuHqj8pvry
-    secrey: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
-    bucket: 4dkankan
-    #公网 point: http://oss-cn-shenzhen.aliyuncs.com
-    #内网 point: http://oss-cn-shenzhen-internal.aliyuncs.com
-    point: http://oss-cn-shenzhen.aliyuncs.com
-#目标
-fyun:
-  aws:
-    s3key: AKIAWCV5QFZ3ZNELKYUY
-    s3secrey: epS5ghyR4LJ7rxk/qJO9ZYh6m9Oz6g5haKDu4yws
-    s3bucket: 4dkankan
-  oss:
-    key: LTAIUrvuHqj8pvry
-    secrey: JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
-    bucket: zfb-4dkankan
-    point: http://oss-cn-shenzhen.aliyuncs.com
 
-db1:
-  fyun:
-    host: https://4dkk.4dage.com
-  main: https://www.4dkankan.com
-
-db2:
-  fyun:
-    host: https://4dkk.4dage.com
-  main: https://zfb.4dkankan.com
 
+logging:
+  path: /home/ubuntu/data/zhiHouse

+ 1 - 15
src/main/resources/application.yaml

@@ -8,22 +8,8 @@ spring:
       # 设置单次请求文件的总大小
       max-request-size: 1024MB
 
-forest:
-  ## 日志总开关,打开/关闭Forest请求/响应日志(默认为 true)
-  log-enabled: true
-  ## 打开/关闭Forest请求日志(默认为 true)
-  log-request: true
-  ## 打开/关闭Forest响应状态日志(默认为 true)
-  log-response-status: true
-  ## 打开/关闭Forest响应内容日志(默认为 false)
-  log-response-content: true
-  ## 请求超时时间,单位为毫秒, 默认值为3000
-  timeout: 300000
-  ## 连接超时时间,单位为毫秒, 默认值为2000
-  connect-timeout: 300000
-
 logging:
   config: classpath:logback-spring.xml
 #mybatis-plus:
 #  configuration:
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志

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

@@ -4,10 +4,10 @@
 <!-- scanPeriod:设置监测配置文件是否有修改的时间间隔,如果没有给出时间单位,默认单位是毫秒。当scan为true时,此属性生效。默认的时间间隔为1分钟。 -->
 <!-- debug:当此属性设置为true时,将打印出logback内部日志信息,实时查看logback运行状态。默认值为false。 -->
 <configuration scan="true" scanPeriod="10 seconds">
-
+	<springProperty scope="context" name="LOG_PATH" source="logging.path"/>
 	<contextName>logback</contextName>
 	<!-- name的值是变量的名称,value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后,可以使“${}”来使用变量。 -->
-	<property name="log.path" value="/home/data-zfb/task/logs" />
+	<property name="log.path" value="${LOG_PATH}/task/logs" />
 
 	<!-- 彩色日志 -->
 	<!-- 彩色日志依赖的渲染类 -->