feat:按行数获取日志

src/main/java/cn/seecoder/paas/service/impl/EnvironmentServiceImpl.java

@@ -254,7 +254,8 @@ public class EnvironmentServiceImpl implements EnvironmentService {
         }
         Map<String, String> res = new HashMap<>();
         for (Container container : pods.get(0).getContainers()) {
-            res.put(container.getName(), logApi.getAll(applicationProperties.getDeploymentNamespace(), pods.get(0).getName(), container.getName()));
+            res.put(container.getName(), logApi.getLastNLines(applicationProperties.getDeploymentNamespace(),
+                    pods.get(0).getName(), container.getName(), applicationProperties.getLog().getLogMaxLine()));
         }
         return res;
     }

src/main/java/cn/seecoder/paas/util/ApplicationProperties.java

@@ -21,6 +21,8 @@ public class ApplicationProperties {
 
     private Docker docker = new Docker();
 
+    private Log log = new Log();
+
     @Data
     public static class K8s {
 
@@ -56,4 +58,9 @@ public class ApplicationProperties {
 
         private String registryPassword;
     }
+
+    @Data
+    public static class Log{
+        private Integer logMaxLine;
+    }
 }

src/main/resources/application.yml

@@ -2,9 +2,9 @@ server:
   port: 8080
 spring:
   datasource:
-    url: jdbc:mysql://172.19.240.15:3306/seecoder_paas?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
+    url: jdbc:mysql://172.29.7.145:3308/seecoder_paas?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&useSSL=false
     username: root
-    password: 1qaz2wsx
+    password: NJU67bdfxPaaS
   jpa:
     hibernate:
       ddl-auto: update
@@ -30,16 +30,24 @@ paas:
     password: 1!2@3#4$
   docker:
     host: unix:///var/run/docker.sock
-    registry: nexus-api.seecii.cn:80
+    registry: 172.29.7.145:8092
     registryUsername: admin
-    registryPassword: admin123
+    registryPassword: NJU67nexus
   k8s:
-    api-server: http://k8s-apiserver.seecii.cn
-    token: eyJhbGciOiJSUzI1NiIsImtpZCI6IiJ9.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJrdWJlLXN5c3RlbSIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJhZG1pbi10b2tlbi1zdzlwOCIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50Lm5hbWUiOiJhZG1pbiIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50LnVpZCI6ImY3MzQ2NzVlLWZmYmItMTFlOS1iYTdjLTIyNmUyZmY2ZTdlYyIsInN1YiI6InN5c3RlbTpzZXJ2aWNlYWNjb3VudDprdWJlLXN5c3RlbTphZG1pbiJ9.GvBP7iNM_WNJN7dPm8ZPszDJeykifhHwBYcF58c4W73iAet1ZcZPrmiurqn4mSHcavUHNR8FqPaafnS3OD4eq5dR-i7frdIBt7yiME7AIGA4pDKWNJ3NykhyfG75omCvtQ2Gp-UvFIdf_4peAilxbwDR2NtWpky4sJQOTukZIYzN9fCeYV8My85XDBl7ze20QBsEKfPxTGZkqmytX-4VmjKkQH9ob7YB90NR2ug5VK8CA16_2ZPjf8Fx4QsdTbkyZKdFo7zIrIID0fa2lpOc2TpCKWeYCl335-ULllpxds6kiVwkRXYP-5zkIOfpI_0SshK7kbBjd238OLM3KFDf6A
+    api-server: https://172.29.7.145:6443
+    token: eyJhbGciOiJSUzI1NiIsImtpZCI6IjFDTjZ0czVmSGdqMmNWdzJxOXkxd0kwOTNXUUFiNk1kRG5WNkhMTkJLeUkifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJrdWJlLXN5c3RlbSIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJhZG1pbi10b2tlbi1iYmY0YiIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50Lm5hbWUiOiJhZG1pbiIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50LnVpZCI6IjdhZWQ0MWQ3LTRmZTUtNDdiYi1iOGMzLWYwZDk0ZDBlNTYyOSIsInN1YiI6InN5c3RlbTpzZXJ2aWNlYWNjb3VudDprdWJlLXN5c3RlbTphZG1pbiJ9.EPlY21DiIQWwILnq4xtQCbvwcgfRgqSjx-P7o9BRg-GHBtKqiYnlyWK4rhy829Ia_Yn-O8312_rXl84WYlIxXsbFTXNTuciv3PO1zkoIumUvAIUBVqfDhVxvIrHKkugJrXhpvS5QLNoKxxiBmYSO_wOBuPh6OJFVtP7qc4ulLI-f9bZ11czms9wZIkNJ14gMNnrwK15gulwctv8_lxvdeOv-R9o85qhw2yq9y_lIwHFbTda3tVmFw-jnN9pMMvqov-lI3Zdns__tDt0F4Uk6SHxXVIMftMh0DpLQhrqt_M9S_SBCFY09SyYQS93pbNim4g-ARNxvuqVGf5xZJPfK_A
     validateSSL: false
     debug: false
-    imageRegistry: 192.168.68.79:18082
-    secretName: seecoder-pass
+    imageRegistry: 172.29.7.145:8092
+    secretName: seecoder-paas
+    useTls: true
+  log:
+    log-max-line: 10000
+
   deployment-namespace: seec
-  deployment-host: seecii.cn
-  pvcStorageClassName: seecoder-paas
+  # 内网也使用这个网址，由用户自己编辑，以便复用证书
+  # 例如，编辑前缀为p-ii，部署后为：https://p-ii.seec.seecoder.cn
+  deployment-host: seec.seecoder.cn
+  # 使用heketi创建的存储类
+  pvcStorageClassName: seecoder-paas
+