فهرست منبع

场景下载服务部署配置

dengsixing 3 سال پیش
والد
کامیت
c5afbd5f35

+ 2 - 0
4dkankan-center-scene-download/src/main/java/com/fdkankan/download/service/impl/SceneDownLoadServiceImpl.java

@@ -10,6 +10,7 @@ import com.fdkankan.redis.util.RedisUtil;
 import java.util.Objects;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
 
 /**
@@ -20,6 +21,7 @@ import org.springframework.stereotype.Service;
  * @author dengsixing
  * @since 2022/2/22
  **/
+@RefreshScope
 @Service
 public class SceneDownLoadServiceImpl implements ISceneDownLoadService {
 

+ 2 - 0
4dkankan-center-scene-download/src/main/java/com/fdkankan/download/service/impl/SceneDownloadHandlerServiceImpl.java

@@ -44,6 +44,7 @@ import lombok.var;
 import org.apache.tools.zip.ZipOutputStream;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
@@ -56,6 +57,7 @@ import org.springframework.web.client.RestTemplate;
  * @author dengsixing
  * @since 2022/2/22
  **/
+@RefreshScope
 @Slf4j
 @Service
 public class SceneDownloadHandlerServiceImpl {

+ 4 - 24
4dkankan-center-scene-download/src/main/resources/bootstrap-pro.yml

@@ -8,9 +8,9 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 192.168.0.47:8848
+        server-addr: 172.18.157.42:8848
         file-extension: yaml
-        namespace: 4dkankan-dev
+        namespace: 4dkankan-pro
         extension-configs:
           - data-id: 4dkankan-center-scene-download.yaml
             group: DEFAULT_GROUP
@@ -29,28 +29,8 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
       discovery:
-        server-addr: 192.168.0.47:8848
-        namespace: public
-path:
-  v3school: /downloads/v3local/
-  zip-root: wwwroot/
-  zip-local: /downloads/scenes/%s.zip
-  zip-oss: downloads/scenes/%s.zip
-
-download:
-  config:
-    server-url: https://test.4dkankan.com/
-    public-url: https://4dkk.4dage.com/
-    resource-url: https://4dkankan.oss-cn-shenzhen.aliyuncs.com/
-#    server-url: https://eur.4dkankan.com/
-#    public-url: https://eurs3.4dkankan.com/
-#    resource-url: https://eurs3.4dkankan.com/
-    exe-name: start-browser.bat
-    exe-content: | # | 表示不转义特殊字符
-      taskkill /f /t /im http.exe
-      start http://127.0.0.1:9000/spc.html?m=%s
-      http.exe -nc -p 9000 -r wwwroot
-
+        server-addr: 172.18.157.42:8848
+        namespace: 4dkankan-pro
 
 
 

+ 3 - 24
4dkankan-center-scene-download/src/main/resources/bootstrap-test.yml

@@ -8,9 +8,9 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 172.18.156.39:8848
+        server-addr: 120.24.144.164:8848
         file-extension: yaml
-        namespace: 4dkankan-dev
+        namespace: 4dkankan-test
         extension-configs:
           - data-id: 4dkankan-center-scene-download.yaml
             group: DEFAULT_GROUP
@@ -29,28 +29,7 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
       discovery:
-        server-addr: 172.18.156.39:8848
+        server-addr: 120.24.144.164:8848
         namespace: 4dkankan-test
-path:
-  v3school: /downloads/v3local/
-  zip-root: wwwroot/
-  zip-local: /downloads/scenes/%s.zip
-  zip-oss: downloads/scenes/%s.zip
-
-download:
-  config:
-    server-url: https://test.4dkankan.com/
-    public-url: https://4dkk.4dage.com/
-    resource-url: https://4dkankan.oss-cn-shenzhen.aliyuncs.com/
-#    server-url: https://eur.4dkankan.com/
-#    public-url: https://eurs3.4dkankan.com/
-#    resource-url: https://eurs3.4dkankan.com/
-    exe-name: start-browser.bat
-    exe-content: | # | 表示不转义特殊字符
-      taskkill /f /t /im http.exe
-      start http://127.0.0.1:9000/spc.html?m=%s
-      http.exe -nc -p 9000 -r wwwroot
-
-
 
 

+ 3 - 2
4dkankan-center-scene-download/src/main/resources/logback-spring.xml

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