move config item to softwarelab on application.yml

src/main/java/com/blackstar/softwarelab/checker/ContainerChecker.java

@@ -23,10 +23,10 @@
 
 @Component
 @Slf4j
-@ConditionalOnProperty(prefix = "checker", value = "enabled", havingValue = "true")
+@ConditionalOnProperty(prefix = "softwarelab.checker", value = "enabled", havingValue = "true")
 public class ContainerChecker {
 
- @Value("${checker.sleepMillSeconds:500}")
+ @Value("${softwarelab.checker.sleepMillSeconds:500}")
  private int sleepMillSeconds;
 
  @Autowired

src/main/java/com/blackstar/softwarelab/checker/HardwareChecker.java

@@ -23,8 +23,6 @@ public class HardwareChecker {
 
  private final SystemInfo systemInfo = new SystemInfo();
 
- private Object lock = new Object();
-
  public HardwareInfo getLast() {
  return hardwareInfos.getLast();
  }

src/main/java/com/blackstar/softwarelab/checker/ImageChecker.java

@@ -14,6 +14,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketSession;
@@ -32,13 +33,14 @@
  */
 @Component
 @Slf4j
+@ConditionalOnProperty(prefix = "softwarelab.checker", value = "enabled", havingValue = "true")
 public class ImageChecker {
 
  private Map<AppVersion, WebSocketSessionAndCallback> pullImageMap = new ConcurrentHashMap<>();
 
  private ObjectMapper objectMapper = new ObjectMapper();
 
- @Value("${checker.sleepMillSeconds:500}")
+ @Value("${softwarelab.checker.sleepMillSeconds:500}")
  private int sleepMillSeconds;
 
  @Autowired

src/main/java/com/blackstar/softwarelab/controller/InstanceController.java

@@ -37,7 +37,7 @@ public class InstanceController extends BaseController {
 
  private ObjectMapper objectMapper = new ObjectMapper();
 
- @Value("${instance.maxSize}")
+ @Value("${softwarelab.instance.maxSize}")
  private Integer maxSize;
 
 

src/main/java/com/blackstar/softwarelab/controller/UserController.java

@@ -28,7 +28,7 @@ public class UserController extends BaseController {
  @Autowired
  private ISysUserService userService;
 
- @Value("user.admin.id")
+ @Value("softwarelab.user.admin.id")
  private String adminId;
 
  @RequestMapping(method = RequestMethod.GET, value = "/{id}")

src/main/java/com/blackstar/softwarelab/service/impl/InstanceServiceImpl.java

@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
@@ -50,6 +51,9 @@ public class InstanceServiceImpl extends ServiceImpl<InstanceMapper, Instance> i
  @Autowired
  private IPortService portService;
 
+ @Value("softwarelab.host")
+ private String host;
+
 
  private ObjectMapper objectMapper = new ObjectMapper();
 
@@ -97,7 +101,7 @@ private void processUrl(ContainerInfo startContainerInfo) {
  ports.forEach(containerPortSetting -> {
  if(containerPortSetting.getType().equals("http")&& containerPortSetting.isEntrance()){
  String url = startContainerInfo.getUrl() != null ? startContainerInfo.getUrl() : "";
- startContainerInfo.setUrl("https://localhost:"+containerPortSetting.getTargetPort()+url);
+ startContainerInfo.setUrl("https://"+host+":"+containerPortSetting.getTargetPort()+url);
  }
  });
  }

src/main/java/com/blackstar/softwarelab/service/impl/PortServiceImpl.java

@@ -24,7 +24,7 @@
 public class PortServiceImpl implements IPortService {
 
 
- @Value("${instance.ports}")
+ @Value("${softwarelab.instance.ports}")
  private String ports;
 
  @Autowired

src/main/resources/application.yml

@@ -31,16 +31,20 @@ security:
  tokenIssuer: "${JWT_TOKEN_ISSUER:software-lab}"
  tokenSigningKey: "${JWT_TOKEN_SIGNING_KEY:codeisbeatiful}"
 
-user:
- admin:
- id: 00000000-0000-0000-0000-000000000000
+softwarelab:
+ host: localhost
+ user:
+ admin:
+ id: 00000000-0000-0000-0000-000000000000
+ instance:
+ ports: 30001-39999
+ maxSize: 5
+ checker:
+ enabled: true
+ sleepMillSeconds: 500
 
 
-instance:
- ports: 30001-39999
- maxSize: 5
+source:
+ path:
 
 
-checker:
- enabled: true
- sleepMillSeconds: 500