111

pom.xml

@@ -237,14 +237,13 @@
 
 
     <build>
+        <finalName>${artifactId}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
-
         </plugins>
-
     </build>
 
     <distributionManagement>

src/main/java/com/fdkankan/scene/SceneApplication.java

@@ -1,17 +1,11 @@
 package com.fdkankan.scene;
 
-import com.alibaba.druid.pool.DruidDataSource;
 import com.dtflys.forest.springboot.annotation.ForestScan;
-import io.seata.rm.datasource.xa.DataSourceProxyXA;
-import javax.sql.DataSource;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 

src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -88,10 +88,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     private String ossUrlPrefix;
     @Value("${fyun.type}")
     private String fyunType;
-    @Value("${hot.domain.list}")
-    private String hotDomainList;
-    @Value("${hot.delete}")
-    private String hotDelete;
     @Value("${main.url}")
     private String mainUrl;
     @Value("${scene.url}")
@@ -104,10 +100,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     private int maxCheckTimes;
     @Value("${ecs.checkFile.waitTime:5000}")
     private int waitTime;
-    @Value("${http.host.4dkankanMini}")
-    private String fkankanMiniHost;
-    @Value("${http.api-v4.upgradeToV4ResultSync}")
-    private String URL_UPGRADE_TO_V4_RESULT_SYNC;
 
     @Autowired
     private FYunFileServiceInterface fYunFileService;
@@ -528,21 +520,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                     fYunFileService.deleteFile(bucket,userDataPath + "hot"+sid+".mp4");
                 }
             }
-            if(!FYunTypeEnum.AWS.code().equals(this.fyunType)){
-                JSONObject paramData = new JSONObject();
-                paramData.put("hotId", sid);
-                JSONObject hotListJson = JSONObject.parseObject(OkHttpUtils.httpGet(hotDomainList));
-                if(hotListJson != null){
-                    JSONArray hotListArray = hotListJson.getJSONArray("data");
-                    if(hotListArray != null){
-                        for(int l = 0, len = hotListArray.size(); l < len; l++){
-                            OkHttpUtils.httpPostJson(hotListArray.getString(l) + hotDelete + "?hotId=" + sid
-                                , paramData.toJSONString());
-                        }
-
-                    }
-                }
-            }
         }
 
 

src/main/resources/bootstrap-dev.yml

@@ -3,14 +3,11 @@ spring:
     name: 4dkankan-center-scene
   cloud:
     nacos:
+      server-addr: 120.24.144.164:8848
+      namespace: 4dkankan-v4-test
       config:
-        server-addr: 120.24.144.164:8848
         file-extension: yaml
-        namespace: 4dkankan-v4
-        extension-configs:
-          - data-id: 4dkankan-center-scene.yaml
-            group: DEFAULT_GROUP
-            refresh: true
+        namespace: ${spring.cloud.nacos.namespace}
         shared-configs:
           - data-id: common-db-config.yaml
             group: DEFAULT_GROUP
@@ -20,16 +17,18 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: other-config.yaml
+          - data-id: common-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-upload-config.yaml
+          - data-id: common-fyun-config.yaml
             group: DEFAULT_GROUP
             refresh: true
       discovery:
-        server-addr: ${spring.cloud.nacos.config.server-addr}
-        namespace: 4dkankan-v4
+        namespace: ${spring.cloud.nacos.namespace}
+
+
+
 
 
 

src/main/resources/bootstrap-test.yml

@@ -3,14 +3,11 @@ spring:
     name: 4dkankan-center-scene
   cloud:
     nacos:
+      server-addr: 172.20.1.63:8848
+      namespace: 4dkankan-v4-test
       config:
-        server-addr: v4-nacos.4dkankan.com
         file-extension: yaml
-        namespace: 4dkankan-v4-test
-        extension-configs:
-          - data-id: 4dkankan-center-scene.yaml
-            group: DEFAULT_GROUP
-            refresh: true
+        namespace: ${spring.cloud.nacos.namespace}
         shared-configs:
           - data-id: common-db-config.yaml
             group: DEFAULT_GROUP
@@ -20,7 +17,7 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: other-config.yaml
+          - data-id: common-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
@@ -28,8 +25,7 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
       discovery:
-        server-addr: v4-nacos.4dkankan.com
-        namespace: 4dkankan-v4-test
+        namespace: ${spring.cloud.nacos.namespace}
 
 
 

src/main/resources/logback-spring.xml

@@ -6,11 +6,10 @@
 <configuration scan="true" scanPeriod="10 seconds">
 
 	<springProperty scope="context" name="LOG_PATH" source="logging.path"/>
-	<define name="hostName" class = "com.fdkankan.web.config.LogPathHostNameProperty"/>
 
 	<contextName>logback</contextName>
 	<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
-	<property name="log.path" value="${LOG_PATH}/scene" />
+	<property name="log.path" value="${LOG_PATH}/scene/logs" />
 
 	<!-- 彩色日志 -->
 	<!-- 彩色日志依赖的渲染类 -->
@@ -187,45 +186,6 @@
 	</appender>
 
 
-	<appender name="VISIT_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<!-- 正在记录的日志文件的路径及文件名 -->
-		<file>${log.path}/visit/log_visit.log</file>
-		<!--日志文件输出格式 -->
-		<encoder>
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-			<charset>UTF-8</charset> <!-- 此处设置字符集 -->
-		</encoder>
-		<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${log.path}/visit/log-visit-%d{yyyy-MM-dd}.%i.log
-			</fileNamePattern>
-
-			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-				<maxFileSize>100MB</maxFileSize>
-			</timeBasedFileNamingAndTriggeringPolicy>
-			<!--日志文件保留天数 -->
-			<maxHistory>15</maxHistory>
-		</rollingPolicy>
-		<!-- 此日志文件只记录info级别的 -->
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>info</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-	</appender>
-	<appender name="ASYNC_VISIT_FILE" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
-		<!--默认情况下，当BlockingQueue还有20%容量，他将丢弃TRACE、DEBUG和INFO级别的event，只保留WARN和ERROR级别的event。为了保持所有的events，设置该值为0。-->
-		<discardingThreshold>0</discardingThreshold>
-		<!--queue配置最大容量为256个events。如果队列被填满，应用程序线程被阻止记录新的events，直到工作线程有机会来转发一个或多个events。
-		因此队列深度需要根据业务场景进行相应的测试，做出相应的更改，以达到较好的性能。-->
-		<queueSize>2048</queueSize>
-		<includeCallerData>false</includeCallerData>
-		<appender-ref ref="VISIT_FILE"/>
-	</appender>
-	<logger name="visitLog" level="INFO" additivity="false">
-		<appender-ref ref="ASYNC_VISIT_FILE"/>
-	</logger>
-
 	<!-- <logger>用来设置某一个包或者具体的某一个类的日志打印级别、 以及指定<appender>。<logger>仅有一个name属性， 一个可选的level和一个可选的addtivity属性。 name:用来指定受此logger约束的某一个包或者具体的某一个类。 level:用来设置打印级别，大小写无关：TRACE,
 		DEBUG, INFO, WARN, ERROR, ALL 和 OFF， 还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。 如果未设置此属性，那么当前logger将会继承上级的级别。 addtivity:是否向上级logger传递打印信息。默认是true。 -->
 	<!--<logger name="org.springframework.web" level="info"/> -->
@@ -271,55 +231,6 @@
 		</root>
 	</springProfile>
 
-<!--	<springProfile name="dev">-->
-<!--		<root level="info">-->
-<!--			<appender-ref ref="CONSOLE" />-->
-<!--			<appender-ref ref="DEBUG_FILE" />-->
-<!--			<appender-ref ref="INFO_FILE" />-->
-<!--			<appender-ref ref="WARN_FILE" />-->
-<!--			<appender-ref ref="ERROR_FILE" />-->
-<!--			<appender-ref ref="ALL_FILE" />-->
-<!--		</root>-->
-<!--		&lt;!&ndash; <logger name="com.xusanduo.demo" level="debug"/>开发环境, 指定某包日志为debug级 &ndash;&gt;-->
-<!--	</springProfile>-->
-
-<!--	<springProfile name="test">-->
-<!--		<root level="info">-->
-<!--			<appender-ref ref="CONSOLE" />-->
-<!--			<appender-ref ref="DEBUG_FILE" />-->
-<!--			<appender-ref ref="INFO_FILE" />-->
-<!--			<appender-ref ref="WARN_FILE" />-->
-<!--			<appender-ref ref="ERROR_FILE" />-->
-<!--			<appender-ref ref="ALL_FILE" />-->
-<!--		</root>-->
-<!--		&lt;!&ndash; <logger name="com.xusanduo.demo" level="info"/> 测试环境, 指定某包日志为info级 &ndash;&gt;-->
-<!--	</springProfile>-->
-
-<!--	<springProfile name="pro">-->
-<!--		<root level="error">-->
-<!--			&lt;!&ndash; 生产环境最好不配置console写文件 &ndash;&gt;-->
-<!--			<appender-ref ref="CONSOLE" />-->
-<!--			<appender-ref ref="DEBUG_FILE" />-->
-<!--			<appender-ref ref="INFO_FILE" />-->
-<!--			<appender-ref ref="WARN_FILE" />-->
-<!--			<appender-ref ref="ERROR_FILE" />-->
-<!--			<appender-ref ref="ALL_FILE" />-->
-<!--		</root>-->
-<!--		&lt;!&ndash; <logger name="com.xusanduo.demo" level="warn"/> 生产环境, 指定某包日志为warn级 &ndash;&gt;-->
-<!--		&lt;!&ndash; <logger name="com.xusanduo.demo.MyApplication" level="info"/> 特定某个类打印info日志, 比如application启动成功后的提示语 &ndash;&gt;-->
-<!--	</springProfile>-->
-
-	<!--生产环境:输出到文件 -->
-	<!--<springProfile name="pro"> -->
-	<!--<root level="info"> -->
-	<!--<appender-ref ref="CONSOLE" /> -->
-	<!--<appender-ref ref="DEBUG_FILE" /> -->
-	<!--<appender-ref ref="INFO_FILE" /> -->
-	<!--<appender-ref ref="ERROR_FILE" /> -->
-	<!--<appender-ref ref="WARN_FILE" /> -->
-	<!--</root> -->
-	<!--</springProfile> -->
-
 </configuration>