diff --git a/template/.devcontainer/devcontainer.json b/template/.devcontainer/devcontainer.json deleted file mode 100644 index 10f1066..0000000 --- a/template/.devcontainer/devcontainer.json +++ /dev/null @@ -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" - ] - } - } - } diff --git a/template/.env b/template/.env deleted file mode 100644 index 7aa7206..0000000 --- a/template/.env +++ /dev/null @@ -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 diff --git a/template/.gitignore b/template/.gitignore index 0f24904..a300369 100644 --- a/template/.gitignore +++ b/template/.gitignore @@ -29,5 +29,5 @@ logs/ ## vs .vs +modules/** !modules/.gitkeep -.gen diff --git a/template/.idea/dataSources.xml b/template/.idea/dataSources.xml deleted file mode 100644 index 5791137..0000000 --- a/template/.idea/dataSources.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - mysql.8 - true -{{- if eq .dbType "mysql" }} - com.mysql.cj.jdbc.Driver -{{- else if eq .dbType "postgresql" }} - org.postgresql.Driver -{{- end }} - jdbc:{{ .dbType }}://{{ .db_address }}/{{ .db_database }} - $ProjectFileDir$ - - - diff --git a/template/.mvn/wrapper/maven-wrapper.properties b/template/.mvn/wrapper/maven-wrapper.properties index d145514..95d441b 100644 --- a/template/.mvn/wrapper/maven-wrapper.properties +++ b/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.8.8/apache-maven-3.8.8-bin.zip -distributionSha256Sum=2e181515ce8ae14b7a904c40bb4794831f5fd1d9641107a13b916af15af4001a +distributionUrl=https://maven.aliyun.com/repository/public/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip +distributionSha256Sum=7822eb593d29558d8edf87845a2c47e36e2a89d17a84cd2390824633214ed423 wrapperUrl=https://maven.aliyun.com/repository/public/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar wrapperUrlSha256Sum=e63a53cfb9c4d291ebe3c2b0edacb7622bbc480326beaa5a0456e412f52f066a diff --git a/template/Dockerfile b/template/Dockerfile index dde693a..47d0871 100644 --- a/template/Dockerfile +++ b/template/Dockerfile @@ -3,7 +3,7 @@ FROM registry.cn-hangzhou.aliyuncs.com/zeroware/javaapp-builder:latest as builde 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 --mount=type=cache,target=/root/.m2/repository,rw --mount=type=tmpfs,target=/root/.m2/repository/com/hande mvnd clean package -Dmaven.test.skip=true RUN cp ${JAR_FILE} app.jar RUN java -Djarmode=layertools -jar ./app.jar extract diff --git a/template/common/src/main/java/{{.packagePath}}/common/config/RocketMqAutoConfiguration.java b/template/common/src/main/java/{{.packagePath}}/common/config/RocketMqAutoConfiguration.java index 402ada7..67ba7b0 100644 --- a/template/common/src/main/java/{{.packagePath}}/common/config/RocketMqAutoConfiguration.java +++ b/template/common/src/main/java/{{.packagePath}}/common/config/RocketMqAutoConfiguration.java @@ -1,5 +1,9 @@ package {{ .package }}.common.config; +import io.micrometer.core.instrument.Clock; +import io.micrometer.core.instrument.MeterRegistry; +import io.micrometer.core.instrument.MockClock; +import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import javax.annotation.Resource; @@ -12,7 +16,6 @@ import {{ .package }}.common.rocketmq.RocketMQServiceImpl; public class RocketMqAutoConfiguration { @Resource private MqConfig mqConfig; - @Bean RocketMQService createRocketMQService() { RocketMQServiceImpl instance = new RocketMQServiceImpl(mqConfig.getNameServer()); diff --git a/template/devfile.yaml b/template/devfile.yaml deleted file mode 100644 index 2f266a3..0000000 --- a/template/devfile.yaml +++ /dev/null @@ -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 diff --git a/template/entrance/mq/src/main/java/{{.packagePath}}/entrance/mq/consumer/README.md b/template/entrance/mq/src/main/java/com/hande/handeTest/entrance/mq/consumer/README.md similarity index 100% rename from template/entrance/mq/src/main/java/{{.packagePath}}/entrance/mq/consumer/README.md rename to template/entrance/mq/src/main/java/com/hande/handeTest/entrance/mq/consumer/README.md diff --git a/template/entrance/mq/src/main/java/{{.packagePath}}/entrance/mq/converter/README.md b/template/entrance/mq/src/main/java/com/hande/handeTest/entrance/mq/converter/README.md similarity index 100% rename from template/entrance/mq/src/main/java/{{.packagePath}}/entrance/mq/converter/README.md rename to template/entrance/mq/src/main/java/com/hande/handeTest/entrance/mq/converter/README.md diff --git a/template/entrance/mq/src/main/java/{{.packagePath}}/entrance/mq/dto/README.md b/template/entrance/mq/src/main/java/com/hande/handeTest/entrance/mq/dto/README.md similarity index 100% rename from template/entrance/mq/src/main/java/{{.packagePath}}/entrance/mq/dto/README.md rename to template/entrance/mq/src/main/java/com/hande/handeTest/entrance/mq/dto/README.md diff --git a/template/entrance/mq/src/main/java/{{.packagePath}}/entrance/mq/utils/README.md b/template/entrance/mq/src/main/java/com/hande/handeTest/entrance/mq/utils/README.md similarity index 100% rename from template/entrance/mq/src/main/java/{{.packagePath}}/entrance/mq/utils/README.md rename to template/entrance/mq/src/main/java/com/hande/handeTest/entrance/mq/utils/README.md diff --git a/template/entrance/pom.xml b/template/entrance/pom.xml index 17a72f2..def4314 100644 --- a/template/entrance/pom.xml +++ b/template/entrance/pom.xml @@ -1,28 +1,24 @@ - - - - 4.0.0 - - - {{ .groupId }} - {{ .artifactId }} - {{ .version }} - + + + 4.0.0 + + {{ .groupId }} + {{ .artifactId }} + 1.0-SNAPSHOT + {{ .artifactId }}-entrance {{ .version }} - pom - - - - {{ .groupId }} + pom + + + {{ .groupId }} {{ .artifactId }}-common {{ .version }} - - - - - mq - web - + + + + mq + web + diff --git a/template/entrance/web/pom.xml b/template/entrance/web/pom.xml index 2b17cef..4562f86 100644 --- a/template/entrance/web/pom.xml +++ b/template/entrance/web/pom.xml @@ -47,7 +47,6 @@ true - false diff --git a/template/entrance/web/src/main/java/{{.packagePath}}/entrance/web/AppApplication.java b/template/entrance/web/src/main/java/com/hande/handeTest/entrance/web/AppApplication.java similarity index 87% rename from template/entrance/web/src/main/java/{{.packagePath}}/entrance/web/AppApplication.java rename to template/entrance/web/src/main/java/com/hande/handeTest/entrance/web/AppApplication.java index 2c278b8..9282a27 100644 --- a/template/entrance/web/src/main/java/{{.packagePath}}/entrance/web/AppApplication.java +++ b/template/entrance/web/src/main/java/com/hande/handeTest/entrance/web/AppApplication.java @@ -13,6 +13,7 @@ import com.vs.debug.stack.agent.StackContextInvokeRecorder; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; @@ -23,8 +24,8 @@ import org.springframework.context.annotation.Import; * @author byteawake * @date 2021/5/11 下午5:30 */ -@SpringBootApplication(scanBasePackages = {"{{ .groupId }}", "com.vs", "{{ .groupId }}.index_sync"}) -@VSDaoBeanScan(basePackages = {"com.vs","{{ .groupId }}"}) +@SpringBootApplication(scanBasePackages = {"com.hande", "com.vs", "com.hande.index_sync"}) +@VSDaoBeanScan(basePackages = {"com.vs","com.hande"}) @Import(DataSourceConfig.class) @EnableVSReplayConfiguration @EnableVSMockConfiguration diff --git a/template/entrance/web/src/main/resources/application-local.properties b/template/entrance/web/src/main/resources/application-local.properties index 9fb7df4..1c93b5f 100644 --- a/template/entrance/web/src/main/resources/application-local.properties +++ b/template/entrance/web/src/main/resources/application-local.properties @@ -1,44 +1,55 @@ -server.port=8080 +server.port=8082 endpoints.enabled=false server.forward-headers-strategy=framework #custom corss-domain headers, split by ',' cross.domain.headers= #spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration -base.package={{ .groupId }} +base.package=com.hande # datasource -spring.datasource.url=jdbc:{{ .dbType }}://${DB_HOST:{{ .dbHost }}:{{ .dbPort }}}/${DB_DATABASE:{{ .dbDatabase }}}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai -spring.datasource.username=${DB_USER:{{ .dbUser }}} -spring.datasource.password=${DB_PASSWORD:{{ .dbPassword }}} -{{- if eq .dbType "mysql" }} +spring.datasource.url=jdbc:mysql://${DB_HOST:10.0.2.201:3306}/${DB_DATABASE:hande_test}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false +spring.datasource.username=${DB_USER:hande_test_user} +spring.datasource.password=${DB_PASSWORD:Yu0FvhjUQDGdnmm5} spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -{{- else if eq .dbType "postgresql" }} -spring.datasource.driver-class-name=org.postgresql.Driver -{{- end }} spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource spring.datasource.tomcat.max-age=3600000 spring.jpa.open-in-view=false +management.metrics.export.simple.enabled=false +spring.redis.host=${REDIS_HOST:redis.byteawake.com} + # flyway spring.flyway.enabled=false spring.flyway.outOfOrder=true spring.flyway.baselineOnMigrate=true - +spring.upload.file.path=/data/upload +spring.exception.isHtmlRequired=false +spring.main.lazy-initialization=true +application.name=libawall mybatis.configuration.map-underscore-to-camel-case=true +spring.url.aaa=http://localhost:8080 +spring.websocket.enabled=false +spring.application.name=libawall +spring.security.enabled=false +spring.login.security.enableRoleRequired=false +spring.login.security.login=false +spring.security.authignored=/api/**,/rpc/** #rocketmq -rocketmq.name-server=${ROCKETMQ_HOST:{{ .rocketmq_address }}} -rocketmq.topic=${DB_DATABASE:{{ .rocketmq_topic }}} -rocketmq.consumerGroup={{ .rocketmq_consumerGroup }} +rocketmq.name-server=${ROCKETMQ_HOST:10.0.2.221:9876;10.0.2.222:9876;10.0.2.223:9876} +rocketmq.topic=${DB_DATABASE:hande_test} +rocketmq.consumerGroup=CID_handeTest rocketmq.tag=* -rocketmq.producer.group={{ .rocketmq_producerGroup }} +rocketmq.producer.group=PID_handeTest +spring.main.allow-circular-references=true +spring.login.security.csrf=false #elasticsearch -essql.hosts=${OPENSEARCH_HOST:{{ .elasticsearch_host }}} -essql.port={{ .elasticsearch_port }} -essql.username=${OPENSEARCH_USER:{{ .elasticsearch_username }}} -essql.password=${OPENSEARCH_PASSWORD:{{ .elasticsearch_password }}} -essql.scheme=${OPENSEARCH_SCHEME:{{ .elasticsearch_scheme }}} +essql.hosts=${OPENSEARCH_HOST:10.0.2.221,10.0.2.222,10.0.2.223} +essql.port=9200 +essql.username=${OPENSEARCH_USER:admin} +essql.password=${OPENSEARCH_PASSWORD:dnZkaNVK} +essql.scheme=${OPENSEARCH_SCHEME:https} #get user config get_user_uri={} @@ -51,20 +62,20 @@ out.response.headers=Content-Type out.host= #xxljob -xxl.job.admin.addresses=${XXL_JOB_ADMIN_ADDRESS:{{ .xxljob_address }}} +xxl.job.admin.addresses=${XXL_JOB_ADMIN_ADDRESS:https://xxljob.teitui.com/xxl-job-admin} 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.password=${XXL_JOB_ADMIN_PASSWORD:{{ .xxljob_password }}} +xxl.job.executor.appname=handeTest +xxl.job.executor.title=handeTest +xxl.job.accessToken=default_token +xxl.job.admin.username=${XXL_JOB_ADMIN_USER:admin} +xxl.job.admin.password=${XXL_JOB_ADMIN_PASSWORD:123456} #redis -redis-config.pool.hostAndPort=${REDIS_HOST:{{ .redis_address }}} -redis-config.pool.password=${REDIS_PASSWORD:{{ .redis_password }}} -redis-config.pool.maxTotal={{ .redis_maxTotal }} -redis-config.pool.maxIdle={{ .redis_maxIdle }} -redis-config.pool.minIdle={{ .redis_minIdle }} +redis-config.pool.hostAndPort=${REDIS_HOST:redis.byteawake.com:6379} +redis-config.pool.password=${REDIS_PASSWORD:} +redis-config.pool.maxTotal=100 +redis-config.pool.maxIdle=10 +redis-config.pool.minIdle=10 redis-config.pool.maxWaitMillis=10000 redis-config.pool.softMinEvictableIdleTimeMillis=10000 redis-config.pool.testOnBorrow=true diff --git a/template/entrance/web/src/main/resources/application-online.properties b/template/entrance/web/src/main/resources/application-online.properties index 7785364..df70c60 100644 --- a/template/entrance/web/src/main/resources/application-online.properties +++ b/template/entrance/web/src/main/resources/application-online.properties @@ -5,16 +5,12 @@ server.forward-headers-strategy=framework cross.domain.headers= #spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration -base.package={{ .groupId }} +base.package=com.hande # datasource -spring.datasource.url=jdbc:{{ .dbType }}://${DB_HOST:{{ .dbHost }}:{{ .dbPort }}}/${DB_DATABASE:{{ .dbDatabase }}}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai -spring.datasource.username=${DB_USER:{{ .dbUser }}} -spring.datasource.password=${DB_PASSWORD:{{ .dbPassword }}} -{{- if eq .dbType "mysql" }} +spring.datasource.url=jdbc:mysql://${DB_HOST:10.0.2.201:3306}/${DB_DATABASE:hande_test}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai +spring.datasource.username=${DB_USER:hande_test_user} +spring.datasource.password=${DB_PASSWORD:Yu0FvhjUQDGdnmm5} spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -{{- else if eq .dbType "postgresql" }} -spring.datasource.driver-class-name=org.postgresql.Driver -{{- end }} spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource spring.datasource.tomcat.max-age=3600000 spring.jpa.open-in-view=false @@ -28,14 +24,14 @@ mybatis.configuration.map-underscore-to-camel-case=true #rocketmq rocketmq.name-server=${ROCKETMQ_HOST} -rocketmq.topic={{ .rocketmq_topic }} -rocketmq.consumerGroup={{ .rocketmq_consumerGroup }} +rocketmq.topic=hande_test +rocketmq.consumerGroup=CID_handeTest rocketmq.tag=* -rocketmq.producer.group={{ .rocketmq_producerGroup }} +rocketmq.producer.group=PID_handeTest #elasticsearch essql.hosts=${OPENSEARCH_HOST} -essql.port={{ .elasticsearch_port }} +essql.port=9200 essql.username=${OPENSEARCH_USER:admin} essql.password=${OPENSEARCH_PASSWORD:admin} essql.scheme=${OPENSEARCH_SCHEME:https} @@ -52,18 +48,18 @@ out.host= #xxljob xxl.job.admin.addresses=${XXL_JOB_ADMIN_ADDRESS} xxl.job.executor.port=9999 -xxl.job.executor.appname={{ .artifactId }} -xxl.job.executor.title={{ .artifactId }} -xxl.job.accessToken={{ .xxljob_accessToken }} +xxl.job.executor.appname=handeTest +xxl.job.executor.title=handeTest +xxl.job.accessToken=default_token xxl.job.admin.username=${XXL_JOB_ADMIN_USER:admin} xxl.job.admin.password=${XXL_JOB_ADMIN_PASSWORD:123456} #redis redis-config.pool.hostAndPort=${REDIS_HOST} redis-config.pool.password=${REDIS_PASSWORD} -redis-config.pool.maxTotal={{ .redis_maxTotal }} -redis-config.pool.maxIdle={{ .redis_maxIdle }} -redis-config.pool.minIdle={{ .redis_minIdle }} +redis-config.pool.maxTotal=100 +redis-config.pool.maxIdle=10 +redis-config.pool.minIdle=10 redis-config.pool.maxWaitMillis=10000 redis-config.pool.softMinEvictableIdleTimeMillis=10000 redis-config.pool.testOnBorrow=true diff --git a/template/entrance/web/src/main/resources/application-remote.properties b/template/entrance/web/src/main/resources/application-remote.properties index 9a2f585..5e1f820 100644 --- a/template/entrance/web/src/main/resources/application-remote.properties +++ b/template/entrance/web/src/main/resources/application-remote.properties @@ -5,16 +5,12 @@ server.forward-headers-strategy=framework cross.domain.headers= #spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration -base.package={{ .groupId }} +base.package=com.hande # datasource -spring.datasource.url=jdbc:{{ .dbType }}://${DB_HOST:{{ .dbHost }}:{{ .dbPort }}}/${DB_DATABASE:{{ .dbDatabase }}}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai -spring.datasource.username=${DB_USER:{{ .dbUser }}} -spring.datasource.password=${DB_PASSWORD:{{ .dbPassword }}} -{{- if eq .dbType "mysql" }} +spring.datasource.url=jdbc:mysql://${DB_HOST:10.0.2.201:3306}/${DB_DATABASE:hande_test}?characterEncoding=utf-8&serverTimezone=Asia/Shanghai +spring.datasource.username=${DB_USER:hande_test_user} +spring.datasource.password=${DB_PASSWORD:Yu0FvhjUQDGdnmm5} spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -{{- else if eq .dbType "postgresql" }} -spring.datasource.driver-class-name=org.postgresql.Driver -{{- end }} spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource spring.datasource.tomcat.max-age=3600000 spring.jpa.open-in-view=false @@ -27,18 +23,18 @@ spring.flyway.baselineOnMigrate=true mybatis.configuration.map-underscore-to-camel-case=true #rocketmq -rocketmq.name-server=${ROCKETMQ_HOST:{{ .rocketmq_address }}} -rocketmq.topic=${MYSQL_DATABASE:{{ .rocketmq_topic }}} -rocketmq.consumerGroup={{ .rocketmq_consumerGroup }} +rocketmq.name-server=${ROCKETMQ_HOST:10.0.2.221:9876;10.0.2.222:9876;10.0.2.223:9876} +rocketmq.topic=${MYSQL_DATABASE:hande_test} +rocketmq.consumerGroup=CID_handeTest rocketmq.tag=* -rocketmq.producer.group={{ .rocketmq_producerGroup }} +rocketmq.producer.group=PID_handeTest #elasticsearch -essql.hosts=${OPENSEARCH_HOST:{{ .elasticsearch_host }}} -essql.port={{ .elasticsearch_port }} -essql.username=${OPENSEARCH_USER:{{ .elasticsearch_username }}} -essql.password=${OPENSEARCH_PASSWORD:{{ .elasticsearch_password }}} -essql.scheme=${OPENSEARCH_SCHEME:{{ .elasticsearch_scheme }}} +essql.hosts=${OPENSEARCH_HOST:10.0.2.221,10.0.2.222,10.0.2.223} +essql.port=9200 +essql.username=${OPENSEARCH_USER:admin} +essql.password=${OPENSEARCH_PASSWORD:dnZkaNVK} +essql.scheme=${OPENSEARCH_SCHEME:https} #get user config get_user_uri={} @@ -51,20 +47,20 @@ out.response.headers=Content-Type out.host= #xxljob -xxl.job.admin.addresses=${XXL_JOB_ADMIN_ADDRESS:{{ .xxljob_address }}} +xxl.job.admin.addresses=${XXL_JOB_ADMIN_ADDRESS:https://xxljob.teitui.com/xxl-job-admin} 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.password=${XXL_JOB_ADMIN_PASSWORD:{{ .xxljob_password }}} +xxl.job.executor.appname=handeTest +xxl.job.executor.title=handeTest +xxl.job.accessToken=default_token +xxl.job.admin.username=${XXL_JOB_ADMIN_USER:admin} +xxl.job.admin.password=${XXL_JOB_ADMIN_PASSWORD:123456} #redis -redis-config.pool.hostAndPort=${REDIS_HOST:{{ .redis_address }}} -redis-config.pool.password=${REDIS_PASSWORD:{{ .redis_password }}} -redis-config.pool.maxTotal={{ .redis_maxTotal }} -redis-config.pool.maxIdle={{ .redis_maxIdle }} -redis-config.pool.minIdle={{ .redis_minIdle }} +redis-config.pool.hostAndPort=${REDIS_HOST:redis.byteawake.com:6379} +redis-config.pool.password=${REDIS_PASSWORD:} +redis-config.pool.maxTotal=100 +redis-config.pool.maxIdle=10 +redis-config.pool.minIdle=10 redis-config.pool.maxWaitMillis=10000 redis-config.pool.softMinEvictableIdleTimeMillis=10000 redis-config.pool.testOnBorrow=true diff --git a/template/entrance/web/src/main/resources/application.properties b/template/entrance/web/src/main/resources/application.properties index fd5a2cb..aa1f493 100644 --- a/template/entrance/web/src/main/resources/application.properties +++ b/template/entrance/web/src/main/resources/application.properties @@ -1,5 +1,6 @@ spring.profiles.active=local envs=local,remote,online,custom - +spring.main.allow-bean-definition-overriding=true project_id=${projectId} -project_name={{ .artifactId }} \ No newline at end of file +project_name=handeTest +check=true diff --git a/template/entrance/web/src/test/java/{{.packagePath}}/entrance/web/AppApplicationTest.java b/template/entrance/web/src/test/java/com/hande/handeTest/entrance/web/AppApplicationTest.java similarity index 100% rename from template/entrance/web/src/test/java/{{.packagePath}}/entrance/web/AppApplicationTest.java rename to template/entrance/web/src/test/java/com/hande/handeTest/entrance/web/AppApplicationTest.java diff --git a/template/pom.xml b/template/pom.xml index 71640a8..e594f75 100644 --- a/template/pom.xml +++ b/template/pom.xml @@ -1,284 +1,451 @@ - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.3.7.RELEASE - - - - - - {{ .groupId }} - {{ .artifactId }} - {{ .version }} - pom - - - UTF-8 - 11 - 11 - 4.12 - 1.2.2 - 1.2.0 - 1.0-SNAPSHOT - 1.18.20 - 1.3.2 - 1.2.3 - 2.23.1 - 1.0-SNAPSHOT - 5.2.4 - 1.3.0-SNAPSHOT - 1.0.0-SNAPSHOT - 1.0.0-SNAPSHOT - 1.0.0-SNAPSHOT - 5.5.7.Final - 1.0-SNAPSHOT - 5.7.4 - 1.0.0-SNAPSHOT - 2.2 - 7.3.1 - 1.2.2 -{{- if eq .dbType "mysql" }} -{{- else if eq .dbType "postgresql" }} - 42.6.2 -{{- end }} - - - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-core - - - org.springframework.boot - spring-boot-starter-test - - - com.vs - ox-bo-common - ${vs.bo.common} - - - com.vs - common-rpc - ${vs.common.rpc.version} - -{{- if eq .dbType "mysql" }} -{{- else if eq .dbType "postgresql" }} - - org.postgresql - postgresql - -{{- end }} - - - - - - - cn.hutool - hutool-all - ${cn.hutool.all} - - - javax.persistence - javax.persistence-api - ${javax.persistence-api} - - - org.hibernate - hibernate-core - ${org.hibernate.core} - - - com.vs - ox-bo-common - ${vs.bo.common} - - - org.springframework.boot - spring-boot-dependencies - 2.6.2 - pom - import - - - junit - junit - ${junit.version} - test - - - - com.vs - ox-springboot-web-starter - ${ox.sprintboot.web.starter.version} - - - - com.vs - dist - ${dist.version} - - - - org.projectlombok - lombok - ${lombok.version} - - - - javax.annotation - javax.annotation-api - ${javax.annotation.api.version} - - - - ch.qos.logback - logback-classic - ${logback.classic.version} - - - - org.apache.logging.log4j - log4j-api - ${log4j.version} - - - - org.apache.logging.log4j - log4j-core - ${log4j.version} - - - - com.vs - ox-basidc-common - ${ox.basidc.common} - - - - org.flywaydb - flyway-core - ${flyway.version} - - - - com.vs - common-rpc - ${vs.common.rpc.version} - - - - com.vs - vs-sqlmapper-spring - ${vs.sqlmapper.spring} - - - com.vs - vs-elasticsearch - ${vs.elasticsearch.version} - - - - com.vs - vs-mock-web - ${vs.mock.spring} - - - com.vs - vs-debug-agent - ${vs.debug.version} - - - com.vs - vs-debug-plugin - ${vs.debug.version} - - - com.vs - vs.common.util - ${vs.common.util.version} - -{{- if eq .db_type "mysql" }} -{{- else if eq .db_type "postgresql" }} - - org.postgresql - postgresql - ${postgresql.version} - -{{- end }} - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.4.1 - - - enforce - - enforce - - - - - [11.0,21.0) - - - 3.8 - - - true - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.3.1 - - UTF-8 - - - - org.springframework.boot - spring-boot-maven-plugin - - true - - - - - - - - zeroware-maven-releases - https://repo.byteawake.com/repository/zeroware-maven-releases/ - - - zeroware-maven-snapshots - https://repo.byteawake.com/repository/zeroware-maven-snapshots/ - - - - - entrance - common - + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.7.18 + + + + {{ .groupId }} + {{ .artifactId }} + {{ .version }} + pom + + UTF-8 + 8 + 8 + 4.12 + 1.2.2 + 1.2.0 + 1.0-SNAPSHOT + 1.18.20 + 1.3.2 + 1.2.3 + 1.0-SNAPSHOT + 5.2.4 + 1.3.0-SNAPSHOT + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT + 5.5.7.Final + 1.0-SNAPSHOT + 5.7.4 + 1.0.0-SNAPSHOT + 2.2 + 7.3.1 + 1.2.2 + 2.2.0.RELEASE + 1.0.0-SNAPSHOT + + + + org.springframework.boot + spring-boot-starter-test + + + + + + + + com.esotericsoftware + kryo + 5.5.0 + + + org.mybatis + mybatis-spring + 2.0.3 + + + org.mybatis + mybatis + 3.5.3 + + + com.toco + toco-all + pom + 1.0.0-SNAPSHOT + + + + com.libawallframework + libawall-core + ${libawall.version} + + + com.libawallframework + libawall-dubbo + ${libawall.version} + + + com.libawallframework + libawall-httpclient + ${libawall.version} + + + com.libawallframework.enums + libawall-enums-client + ${libawall.version} + + + com.libawallframework.enums + libawall-enums-service + ${libawall.version} + + + com.libawallframework.enums + libawall-enums-web + ${libawall.version} + + + com.libawallframework.note + libawall-note-client + ${libawall.version} + + + com.libawallframework.note + libawall-note-service + ${libawall.version} + + + com.libawallframework.note + libawall-note-web + ${libawall.version} + + + com.libawallframework.role + libawall-role-client + ${libawall.version} + + + com.libawallframework.role + libawall-role-service + ${libawall.version} + + + com.libawallframework.role + libawall-role-web + ${libawall.version} + + + com.libawallframework.upload + libawall-upload-client + ${libawall.version} + + + com.libawallframework.upload + libawall-upload-service + ${libawall.version} + + + com.libawallframework.upload + libawall-upload-web + ${libawall.version} + + + com.libawallframework.upload + libawall-upload-core + ${libawall.version} + + + com.libawallframework + libawall-mybatis + ${libawall.version} + + + com.libawallframework + libawall-mybatisplus + ${libawall.version} + + + com.libawallframework + libawall-quartz + ${libawall.version} + + + com.libawallframework.rabbitmq + libawall-rabbitmq-client + ${libawall.version} + + + com.libawallframework.rabbitmq + libawall-rabbitmq-service + ${libawall.version} + + + com.libawallframework.security + libawall-security-common + ${libawall.version} + + + com.libawallframework.security + libawall-security-core + ${libawall.version} + + + com.libawallframework.security + libawall-security-oauth + ${libawall.version} + + + com.libawallframework.security + libawall-security-session-websocket + ${libawall.version} + + + com.libawallframework.security + libawall-security-spring-security + ${libawall.version} + + + com.libawallframework.security + libawall-security-spring-session + ${libawall.version} + + + com.libawallframework + libawall-swagger + ${libawall.version} + + + com.libawallframework + libawall-utils + ${libawall.version} + + + com.libawallframework + libawall-web + ${libawall.version} + + + com.libawallframework + libawall-xxl-job + ${libawall.version} + + + org.quartz-scheduler + quartz + 2.3.2 + + + com.github.binarywang + weixin-java-miniapp + 4.3.0 + + + + + + + + org.springframework.boot + spring-boot-starter-amqp + 2.7.18 + + + + + + + + org.springframework.boot + spring-boot-starter-actuator + 2.7.18 + + + org.springframework + spring-beans + 5.3.31 + + + org.springframework + spring-core + 5.3.31 + + + + + + + + + + + + + + + + + + com.alipay.sdk + alipay-sdk-java + 4.9.28.ALL + + + + + + + + mysql + mysql-connector-java + 8.0.11 + + + com.alibaba + druid-spring-boot-starter + 1.1.17 + + + + + + + + + + + + cn.hutool + hutool-all + ${cn.hutool.all} + + + javax.persistence + javax.persistence-api + ${javax.persistence-api} + + + org.hibernate + hibernate-core + ${org.hibernate.core} + + + com.vs + ox-bo-common + ${vs.bo.common} + + + org.springframework.boot + spring-boot-dependencies + 2.6.2 + pom + import + + + junit + junit + ${junit.version} + test + + + com.vs + ox-springboot-web-starter + ${ox.sprintboot.web.starter.version} + + + com.vs + dist + ${dist.version} + + + org.projectlombok + lombok + ${lombok.version} + + + javax.annotation + javax.annotation-api + ${javax.annotation.api.version} + + + ch.qos.logback + logback-classic + ${logback.classic.version} + + + com.vs + ox-basidc-common + ${ox.basidc.common} + + + org.apache.tomcat.embed + tomcat-embed-core + + + + + org.flywaydb + flyway-core + ${flyway.version} + + + com.vs + common-rpc + ${vs.common.rpc.version} + + + com.vs + vs-sqlmapper-spring + ${vs.sqlmapper.spring} + + + com.vs + vs-elasticsearch + ${vs.elasticsearch.version} + + + com.vs + vs-mock-web + ${vs.mock.spring} + + + com.vs + vs-debug-agent + ${vs.debug.version} + + + com.vs + vs-debug-plugin + ${vs.debug.version} + + + com.vs + vs.common.util + ${vs.common.util.version} + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + UTF-8 + + + + + + + zeroware-maven-releases + https://repo.byteawake.com/repository/zeroware-maven-releases/ + + + zeroware-maven-snapshots + https://repo.byteawake.com/repository/zeroware-maven-snapshots/ + + + + entrance + common + diff --git a/template/project b/template/project index 89f9a32..877dfb9 100644 --- a/template/project +++ b/template/project @@ -1,3 +1,3 @@ -id={{ .projectId }} -name={{ .projectName | replace "-" "_" }} -version={{ .vsVersion }} +id=8347572c-b33f-4888-b1bf-cc9149fff6f7 +name=hande_test +version=1.0.0 diff --git a/template/run.bat b/template/run.bat deleted file mode 100755 index e9956c1..0000000 --- a/template/run.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -cd /d %~dp0 - -.\mvnw.cmd -Dstyle.color=always spring-boot:run %* diff --git a/template/run.sh b/template/run.sh deleted file mode 100755 index 9d027d7..0000000 --- a/template/run.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -cd $(dirname $0) - -./mvnw -Dstyle.color=always spring-boot:run $@