clean the template

template/.devcontainer/devcontainer.json

@@ -1,44 +0,0 @@
-{
-    "name": "devcontainer",
-    "image": "registry.cn-hangzhou.aliyuncs.com/zeroware/devcontainer:latest",
-    "runArgs": ["--name", "${localWorkspaceFolderBasename}_devcontainer", "--env-file",".env"],
-    "forwardPorts": [
-      8080
-    ],
-    "postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
-    "containerUser": "ubuntu",
-    "remoteUser": "ubuntu",
-    "containerEnv": {
-      "HOME": "/home/ubuntu"
-    },
-    "remoteEnv": {
-      "HOME": "/home/ubuntu"
-    },
-    "updateRemoteUserUID": true,
-    "mounts": [
-      {
-        "source": "${localEnv:HOME}${localEnv:USERPROFILE}/.m2/repository",
-        "target": "/home/ubuntu/.m2/repository",
-        "type": "bind"
-      },
-      {
-        "source": "${localEnv:HOME}${localEnv:USERPROFILE}/.ssh",
-        "target": "/home/ubuntu/.ssh",
-        "type": "bind"
-      }
-    ],
-    "customizations": {
-      // Configure properties specific to VS Code.
-      "vscode": {
-        // Set *default* container specific settings.json values on container create.
-        "extensions": [
-          "vscjava.vscode-java-dependency",
-          "vscjava.vscode-maven",
-          "vscjava.vscode-java-test",
-          "vscjava.vscode-java-debug",
-          "vscjava.vscode-java-pack",
-          "esbenp.prettier-vscode"
-        ]
-      }
-    }
-  }

template/.env

@@ -1,12 +0,0 @@
-DB_HOST=116.63.207.117:13306
-
-ROCKETMQ_HOST=116.63.207.117:19876
-
-OPENSEARCH_HOST=116.63.207.117:19200
-OPENSEARCH_PASSWORD=UW15/xI9CRFfAexPJWWZ6g
-
-XXL_JOB_ADMIN_ADDRESS=https://xxljob.byteawake.com/xxl-job-admin
-XXL_JOB_ADMIN_PASSWORD=7t/IbuxDLIU
-
-REDIS_HOST=116.63.207.117:16379
-REDIS_PASSWORD=9P7Alc4bicS/rC992aO45Q

template/.gitlab-ci.yml

@@ -1,4 +0,0 @@
-include:
-  - project: 'internal/gitlab-ci-template'
-    ref: master
-    file: '/vs-server-generate-ci.yml'

template/.mvn/wrapper/maven-wrapper.properties

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://maven.aliyun.com/repository/public/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
+distributionUrl=https://maven.aliyun.com/repository/public/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip
-distributionSha256Sum=7822eb593d29558d8edf87845a2c47e36e2a89d17a84cd2390824633214ed423
+distributionSha256Sum=2e181515ce8ae14b7a904c40bb4794831f5fd1d9641107a13b916af15af4001a
 wrapperUrl=https://maven.aliyun.com/repository/public/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
 wrapperUrlSha256Sum=e63a53cfb9c4d291ebe3c2b0edacb7622bbc480326beaa5a0456e412f52f066a

template/Dockerfile

@@ -1,13 +1,12 @@
-# syntax=registry.cn-hangzhou.aliyuncs.com/imageacc/dockerfile:experimental
+FROM maven:3.8.8 as builder
-FROM registry.cn-hangzhou.aliyuncs.com/zeroware/javaapp-builder:latest as builder
 WORKDIR source
 COPY ./ ./
 ARG JAR_FILE=entrance/web/target/*.jar
-RUN --mount=type=cache,target=/root/.m2/repository,rw --mount=type=tmpfs,target=/root/.m2/repository/{{ .groupId | replace "." "/" }} mvnd clean package -Dmaven.test.skip=true
+RUN mvn clean package -Dmaven.test.skip=true
 RUN cp ${JAR_FILE} app.jar
 RUN java -Djarmode=layertools -jar ./app.jar extract
 
-FROM registry.cn-hangzhou.aliyuncs.com/zeroware/openjdk-17:latest
+FROM openjdk:11.0.14
 WORKDIR /application
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' >/etc/timezone

template/devfile.yaml

@@ -1,34 +0,0 @@
-schemaVersion: 2.2.0
-
-metadata:
-  name: {{ .projectName }}
-
-components:
-  - name: tools
-    container:
-      image: registry.cn-hangzhou.aliyuncs.com/zeroware/devcontainer:latest
-      memoryLimit: 4Gi
-
-      endpoints:
-        - name: http
-          exposure: public
-          protocol: http
-          targetPort: 8080
-
-  - name: ssh-service
-    kubernetes:
-      deployByDefault: true
-      inlined: |
-        apiVersion: v1
-        kind: Service
-        metadata:
-          name: {{ .projectName }}-ssh
-        spec:
-          ports:
-          - name: ssh
-            port: 22222
-            protocol: TCP
-            targetPort: 22222
-          selector:
-            controller.devfile.io/devworkspace_name: {{ .projectName }}
-          type: NodePort

template/environment.yml

@@ -1,42 +0,0 @@
-groupId: {{ .groupId }}
-artifactId: {{ .artifactId }}
-projectName: {{ .projectName }}
-applicationName: {{ .applicationName }}
-branchName: {{ .branchName }}
-clusterName: {{ .clusterName }}
-version: {{ .version }}
-dbType: {{ .dbType }}
-__package: {{ .package }}
-__packagePath: {{ .packagePath }}
-__resources:
-  db:
-    address: {{ .db_address }}
-    database: {{ .db_database }}
-    username: {{ .db_username }}
-    password: {{ .db_password }}
-  rocketmq:
-    address: {{ .rocketmq_address }}
-    topic: {{ .rocketmq_topic }}
-    consumerGroup: {{ .rocketmq_consumerGroup }}
-    producerGroup: {{ .rocketmq_producerGroup }}
-  elasticsearch: 
-    host: {{ .elasticsearch_host }}
-    port: {{ .elasticsearch_port }}
-    scheme: {{ .elasticsearch_scheme }}
-    username: {{ .elasticsearch_username }}
-    password: {{ .elasticsearch_password }}
-  xxljob:
-    address: {{ .xxljob_address }}
-    username: {{ .xxljob_username }}
-    password: {{ .xxljob_password }}
-    accessToken: {{ .xxljob_accessToken }}
-  redis:
-    address: {{ .redis_address }}
-    password: {{ .redis_password }}
-    maxTotal: {{ .redis_maxTotal }}
-    maxIdle: {{ .redis_maxIdle }}
-    minIdle: {{ .redis_minIdle }}
-__platforms:
-  git_url: {{ .git_url }}
-  git_ssh_url: {{ .git_ssh_url }}
-  freeway_url: {{ .freeway_url }}

template/insiis-web/src/main/resources/application-datasource.properties

@@ -1,8 +1,8 @@
 # 数据库配置
 #datasource
-spring.datasource.url=jdbc:{{ .dbType }}://${DB_HOST:{{ .db_address }}}/${DB_DATABASE:{{ .db_database }}}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:{{ .dbType }}://{{ .dbHost }}:{{ .dbPort }}/{{ .db_database }}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-spring.datasource.username=${DB_USER:{{ .db_username }}}
+spring.datasource.username={{ .db_username }}
-spring.datasource.password=${DB_PASSWORD:{{ .db_password }}}
+spring.datasource.password={{ .db_password }}
 spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource
 
 # Druid Data Source Config

template/insiis-web/src/main/resources/application.properties

@@ -80,17 +80,17 @@ logging.ext.business-area=00
 
 
 #xxljob
-xxl.job.admin.addresses=${XXL_JOB_ADMIN_ADDRESS:{{ .xxljob_address }}}
+xxl.job.admin.addresses={{ .xxljob_address }}
 xxl.job.executor.port=9999
 xxl.job.executor.appname={{ .artifactId }}
 xxl.job.executor.title={{ .artifactId }}
 xxl.job.accessToken={{ .xxljob_accessToken }}
-xxl.job.admin.username=${XXL_JOB_ADMIN_USER:{{ .xxljob_username }}}
+xxl.job.admin.username={{ .xxljob_username }}
-xxl.job.admin.password=${XXL_JOB_ADMIN_PASSWORD:{{ .xxljob_password }}}
+xxl.job.admin.password={{ .xxljob_password }}
 
 #redis
-redis-config.pool.hostAndPort=${REDIS_HOST:{{ .redis_address }}}
+redis-config.pool.hostAndPort={{ .redis_address }}
-redis-config.pool.password=${REDIS_PASSWORD:{{ .redis_password }}}
+redis-config.pool.password={{ .redis_password }}
 redis-config.pool.maxTotal={{ .redis_maxTotal }}
 redis-config.pool.maxIdle={{ .redis_maxIdle }}
 redis-config.pool.minIdle={{ .redis_minIdle }}
@@ -106,18 +106,18 @@ redis-config.pool.blockWhenExhausted=true
 redis-config.pool.jmxEnabled=true
 redis-config.pool.lifo=true
 #rocketmq
-rocketmq.name-server=${ROCKETMQ_HOST:{{ .rocketmq_address }}}
+rocketmq.name-server={{ .rocketmq_address }}
-rocketmq.topic=${DB_DATABASE:{{ .rocketmq_topic }}}
+rocketmq.topic={{ .rocketmq_topic }}
 rocketmq.consumerGroup={{ .rocketmq_consumerGroup }}
 rocketmq.tag=*
 rocketmq.producer.group={{ .rocketmq_producerGroup }}
 
 #elasticsearch
-essql.hosts=${OPENSEARCH_HOST:{{ .elasticsearch_host }}}
+essql.hosts={{ .elasticsearch_host }}
 essql.port={{ .elasticsearch_port }}
-essql.username=${OPENSEARCH_USER:{{ .elasticsearch_username }}}
+essql.username={{ .elasticsearch_username }}
-essql.password=${OPENSEARCH_PASSWORD:{{ .elasticsearch_password }}}
+essql.password={{ .elasticsearch_password }}
-essql.scheme=${OPENSEARCH_SCHEME:{{ .elasticsearch_scheme }}}
+essql.scheme={{ .elasticsearch_scheme }}
 
 
 base.package=com.insigma;{{.groupId}}

template/project

@@ -1,3 +0,0 @@
-id={{ .projectId }}
-name={{ .projectName | replace "-" "_" }}
-version={{ .vsVersion }}

values.yml

@@ -1,24 +1,10 @@
 groupId: com.vs
 artifactId: volunteer_bank
-vsVersion: 1.0.0
 projectName: volunteer-bank
-projectId: 3fdc654b-feb2-4d4a-be19-e9ca2998b5d6
-applicationName: "{{ .projectName }}-server"
-branchName: master
-clusterName: "{{ .applicationName }}-{{ .branchName }}"
-version: 1.0-SNAPSHOT
-operator: horsepower
-codeRepoProtocol: https
-codeRepoDomain: bit.byteawake.com
-codeRepoSSHPort: 23123
-codeRepoGroup: vs-server-generate
-codeRepoApplicationParentPath: "{{ .codeRepoGroup }}/{{ .projectName }}"
 dbType: mysql
 dbHost: mysql-rw.staging.svc.cluster.local
 dbPort: 3306
-package: "{{ .groupId }}.{{ .artifactId }}"
+
-packagePath: '{{ .package | replace "." "/" }}'
-db_address: "{{ .dbHost }}:{{ .dbPort }}"
 db_database: '{{ .projectName | replace "-" "_" }}'
 db_username: '{{ .projectName | replace "-" "_" }}_user'
 db_password: "{{ randAlphaNum 16 }}"
@@ -30,7 +16,7 @@ elasticsearch_host: "10.0.2.221,10.0.2.222,10.0.2.223"
 elasticsearch_port: "9200"
 elasticsearch_scheme: "https"
 elasticsearch_username: "admin"
-elasticsearch_password: "dnZkaNVK"
+elasticsearch_password: "ha/KuGfy"
 xxljob_address: "https://xxljob.teitui.com/xxl-job-admin"
 xxljob_username: "admin"
 xxljob_password: "123456"
@@ -40,6 +26,3 @@ redis_password: ""
 redis_maxTotal: 100
 redis_maxIdle: 10
 redis_minIdle: 10
-git_url: "{{ .codeRepoProtocol }}://{{ .codeRepoDomain }}/{{ .codeRepoApplicationParentPath }}/{{ .applicationName }}"
-git_ssh_url: "ssh://git@{{ .codeRepoDomain }}:{{ .codeRepoSSHPort }}/{{ .codeRepoApplicationParentPath }}/{{ .applicationName }}.git"
-freeway_url: "https://fwy.teitui.com/clusters/pods/-/{{ .codeRepoGroup }}/{{ .projectName }}/{{ .applicationName }}/{{ .clusterName }}"