Skip to content

Commit

Permalink
build: 开启2024.10
Browse files Browse the repository at this point in the history
  • Loading branch information
shuigedeng committed Sep 1, 2024
1 parent 6b33b5f commit ae105ad
Show file tree
Hide file tree
Showing 10 changed files with 105 additions and 100 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ plugins {

//https://plugins.gradle.org/plugin/io.swagger.core.v3.swagger-gradle-plugin
//https://github.com/swagger-api/swagger-core/tree/master/modules/swagger-gradle-plugin
id "io.swagger.core.v3.swagger-gradle-plugin" version "2.2.22"
id "io.swagger.core.v3.swagger-gradle-plugin" version "2.2.23"

//id 'org.cyclonedx.bom' version '1.8.2'

Expand Down
9 changes: 7 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@
#\u901A\u8FC7\u5F00\u542F\u5B88\u62A4\u8FDB\u7A0B\uFF0C\u4E0B\u4E00\u6B21\u6784\u5EFA\u7684\u65F6\u5019\uFF0C\u5C06\u4F1A\u8FDE\u63A5\u8FD9\u4E2A\u5B88\u62A4\u8FDB\u7A0B\u8FDB\u884C\u6784\u5EFA\uFF0C\u800C\u4E0D\u662F\u91CD\u65B0 fork \u4E00\u4E2A gradle\u6784\u5EFA\u8FDB\u7A0B
org.gradle.daemon=true
#JVM\u5806\u5185\u5B58\u5927\u5C0F
org.gradle.jvmargs=-Xmx8192m \
-Xms2048m \
org.gradle.jvmargs=-Xmx4096m \
-Xms1024m \
-XX:ReservedCodeCacheSize=2048m \
-XX:+HeapDumpOnOutOfMemoryError \
-XX:+UseG1GC \
-XX:SoftRefLRUPolicyMSPerMB=50 \
-XX:CICompilerCount=2 \
-XX:+HeapDumpOnOutOfMemoryError \
-XX:-OmitStackTraceInFastThrow \
-Dfile.encoding=UTF-8 \
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
Expand Down
2 changes: 1 addition & 1 deletion gradle/docker.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply plugin: "com.bmuschko.docker-spring-boot-application"
//如果url不指定的话
//Mac默认:url = https://index.docker.io/v1/
//Unix默认: url = unix:///var/run/docker.sock
//Windows默认: url = tcp://127.0.0.1:2375
//Windows默认: url = tcp://192.168.218.2:2375

docker {
//url = 'https://192.168.59.103:2376'
Expand Down
2 changes: 1 addition & 1 deletion gradle/springboot.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ bootBuildImage {

docker {
//使用docker
//host = "tcp://127.0.0.1:2376"
//host = "tcp://192.168.218.2:2376"
//tlsVerify = true
//certPath = "/home/users/.minikube/certs"

Expand Down
128 changes: 64 additions & 64 deletions taotao-cloud-ddd-assembly/src/main/resources/application-dev.yml

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions taotao-cloud-ddd-assembly/src/main/resources/application-pre.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jetcache:
# minIdle: 5
# maxIdle: 20
# maxTotal: 50
# host: 127.0.0.1
# host: 192.168.218.2
# port: 6379

easy-es:
Expand Down Expand Up @@ -167,9 +167,9 @@ redisson:
#监测DNS的变化情况的时间间隔。
dnsMonitoringInterval: 5000
#服务器节点地址.必填
#redisson.multiple-server-config.node-addresses[0]=127.0.0.1:6379
#redisson.multiple-server-config.node-addresses[1]=127.0.0.1:6380
#redisson.multiple-server-config.node-addresses[2]=127.0.0.1:6381
#redisson.multiple-server-config.node-addresses[0]=192.168.218.2:6379
#redisson.multiple-server-config.node-addresses[1]=192.168.218.2:6380
#redisson.multiple-server-config.node-addresses[2]=192.168.218.2:6381
nodeAddresses:
- "192.168.10.200:6381"
- "192.168.10.200:6382"
Expand Down Expand Up @@ -253,7 +253,7 @@ arthas:
# ~/logs/arthas/arthas.log (用户目录下面)里可以找到具体端口日志
telnetPort: -1
httpPort: -1
# 127.0.0.1只能本地访问,0.0.0.0则可网络访问,但是存在安全问题
# 192.168.218.2只能本地访问,0.0.0.0则可网络访问,但是存在安全问题
ip: 0.0.0.0
agent-id: ${spring.application.name}
app-name: ${spring.application.name}
Expand Down Expand Up @@ -840,7 +840,7 @@ spring:
oauth2:
resourceserver:
jwt:
jwk-set-uri: http://127.0.0.1:33336/oauth2/jwks
jwk-set-uri: http://192.168.218.2:33336/oauth2/jwks
shardingsphere:
enabled: false
schema:
Expand Down Expand Up @@ -1446,7 +1446,7 @@ kylin:
primary-executor: com.taotao.cloud.lock.kylin.executor.redisson.RedissonLockExecutor #默认执行器。默认redisson>zookeeper
redisson: true #是否开启redisson 默认true
#zookeeper:
# zk-servers: 127.0.0.1:2181 #zk的server地址,多个server之间使用英文逗号分隔开 。配置地址则开启zookeeper
# zk-servers: 192.168.218.2:2181 #zk的server地址,多个server之间使用英文逗号分隔开 。配置地址则开启zookeeper
# session-timeout: 60000 #会话超时时间,默认值60000 单位:毫秒
# connection-timeout: 15000 #连接超时时间,默认值15000 单位:毫秒
# base-sleep-time-ms: 5000 #初始sleep时间,默认值5000 单位:毫秒
Expand Down
14 changes: 7 additions & 7 deletions taotao-cloud-ddd-assembly/src/main/resources/application-pro.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jetcache:
# minIdle: 5
# maxIdle: 20
# maxTotal: 50
# host: 127.0.0.1
# host: 192.168.218.2
# port: 6379

easy-es:
Expand Down Expand Up @@ -167,9 +167,9 @@ redisson:
#监测DNS的变化情况的时间间隔。
dnsMonitoringInterval: 5000
#服务器节点地址.必填
#redisson.multiple-server-config.node-addresses[0]=127.0.0.1:6379
#redisson.multiple-server-config.node-addresses[1]=127.0.0.1:6380
#redisson.multiple-server-config.node-addresses[2]=127.0.0.1:6381
#redisson.multiple-server-config.node-addresses[0]=192.168.218.2:6379
#redisson.multiple-server-config.node-addresses[1]=192.168.218.2:6380
#redisson.multiple-server-config.node-addresses[2]=192.168.218.2:6381
nodeAddresses:
- "192.168.10.200:6381"
- "192.168.10.200:6382"
Expand Down Expand Up @@ -253,7 +253,7 @@ arthas:
# ~/logs/arthas/arthas.log (用户目录下面)里可以找到具体端口日志
telnetPort: -1
httpPort: -1
# 127.0.0.1只能本地访问,0.0.0.0则可网络访问,但是存在安全问题
# 192.168.218.2只能本地访问,0.0.0.0则可网络访问,但是存在安全问题
ip: 0.0.0.0
agent-id: ${spring.application.name}
app-name: ${spring.application.name}
Expand Down Expand Up @@ -840,7 +840,7 @@ spring:
oauth2:
resourceserver:
jwt:
jwk-set-uri: http://127.0.0.1:33336/oauth2/jwks
jwk-set-uri: http://192.168.218.2:33336/oauth2/jwks
shardingsphere:
enabled: false
schema:
Expand Down Expand Up @@ -1446,7 +1446,7 @@ kylin:
primary-executor: com.taotao.cloud.lock.kylin.executor.redisson.RedissonLockExecutor #默认执行器。默认redisson>zookeeper
redisson: true #是否开启redisson 默认true
#zookeeper:
# zk-servers: 127.0.0.1:2181 #zk的server地址,多个server之间使用英文逗号分隔开 。配置地址则开启zookeeper
# zk-servers: 192.168.218.2:2181 #zk的server地址,多个server之间使用英文逗号分隔开 。配置地址则开启zookeeper
# session-timeout: 60000 #会话超时时间,默认值60000 单位:毫秒
# connection-timeout: 15000 #连接超时时间,默认值15000 单位:毫秒
# base-sleep-time-ms: 5000 #初始sleep时间,默认值5000 单位:毫秒
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jetcache:
# minIdle: 5
# maxIdle: 20
# maxTotal: 50
# host: 127.0.0.1
# host: 192.168.218.2
# port: 6379

easy-es:
Expand Down Expand Up @@ -167,9 +167,9 @@ redisson:
#监测DNS的变化情况的时间间隔。
dnsMonitoringInterval: 5000
#服务器节点地址.必填
#redisson.multiple-server-config.node-addresses[0]=127.0.0.1:6379
#redisson.multiple-server-config.node-addresses[1]=127.0.0.1:6380
#redisson.multiple-server-config.node-addresses[2]=127.0.0.1:6381
#redisson.multiple-server-config.node-addresses[0]=192.168.218.2:6379
#redisson.multiple-server-config.node-addresses[1]=192.168.218.2:6380
#redisson.multiple-server-config.node-addresses[2]=192.168.218.2:6381
nodeAddresses:
- "192.168.10.200:6381"
- "192.168.10.200:6382"
Expand Down Expand Up @@ -253,7 +253,7 @@ arthas:
# ~/logs/arthas/arthas.log (用户目录下面)里可以找到具体端口日志
telnetPort: -1
httpPort: -1
# 127.0.0.1只能本地访问,0.0.0.0则可网络访问,但是存在安全问题
# 192.168.218.2只能本地访问,0.0.0.0则可网络访问,但是存在安全问题
ip: 0.0.0.0
agent-id: ${spring.application.name}
app-name: ${spring.application.name}
Expand Down Expand Up @@ -840,7 +840,7 @@ spring:
oauth2:
resourceserver:
jwt:
jwk-set-uri: http://127.0.0.1:33336/oauth2/jwks
jwk-set-uri: http://192.168.218.2:33336/oauth2/jwks
shardingsphere:
enabled: false
schema:
Expand Down Expand Up @@ -1446,7 +1446,7 @@ kylin:
primary-executor: com.taotao.cloud.lock.kylin.executor.redisson.RedissonLockExecutor #默认执行器。默认redisson>zookeeper
redisson: true #是否开启redisson 默认true
#zookeeper:
# zk-servers: 127.0.0.1:2181 #zk的server地址,多个server之间使用英文逗号分隔开 。配置地址则开启zookeeper
# zk-servers: 192.168.218.2:2181 #zk的server地址,多个server之间使用英文逗号分隔开 。配置地址则开启zookeeper
# session-timeout: 60000 #会话超时时间,默认值60000 单位:毫秒
# connection-timeout: 15000 #连接超时时间,默认值15000 单位:毫秒
# base-sleep-time-ms: 5000 #初始sleep时间,默认值5000 单位:毫秒
Expand Down
16 changes: 8 additions & 8 deletions taotao-cloud-ddd-assembly/src/main/resources/bootstrap-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spring:
enabled: true
nacos:
discovery:
server-addr: 127.0.0.1:8848
server-addr: 192.168.218.2:8848
metadata:
version: ${ttcVersion}
user.name: "admin"
Expand All @@ -40,7 +40,7 @@ spring:
naming-load-cache-at-start: false
config:
enabled: true
server-addr: 127.0.0.1:8848
server-addr: 192.168.218.2:8848
namespace: 82f5c2ff-c0d5-478d-9987-7f082d1a55d7
username: nacos
password: nacos
Expand All @@ -60,7 +60,7 @@ spring:
# #流控 名称随意
# flow:
# nacos:
# server-addr: 127.0.0.1:8848
# server-addr: 192.168.218.2:8848
# dataId: ${spring.application.name}-flow-rules.json
# namespace: 4c21599b-c836-4f1a-a72f-1260d5474f0f
# username: nacos
Expand All @@ -72,7 +72,7 @@ spring:
# #熔断降级 名称随意
# degrade:
# nacos:
# server-addr: 127.0.0.1:8848
# server-addr: 192.168.218.2:8848
# dataId: ${spring.application.name}-degrade-rules.json
# namespace: 4c21599b-c836-4f1a-a72f-1260d5474f0f
# username: nacos
Expand All @@ -83,7 +83,7 @@ spring:
# #系统规则 名称随意
# system:
# nacos:
# server-addr: 127.0.0.1:8848
# server-addr: 192.168.218.2:8848
# dataId: ${spring.application.name}-dddtem-rules.json
# namespace: 4c21599b-c836-4f1a-a72f-1260d5474f0f
# username: nacos
Expand All @@ -94,7 +94,7 @@ spring:
# #授权规则 名称随意
# authority:
# nacos:
# server-addr: 127.0.0.1:8848
# server-addr: 192.168.218.2:8848
# dataId: ${spring.application.name}-authority-rules.json
# namespace: 4c21599b-c836-4f1a-a72f-1260d5474f0f
# username: nacos
Expand All @@ -105,7 +105,7 @@ spring:
# #参数规则 名称随意
# param-flow:
# nacos:
# server-addr: 127.0.0.1:8848
# server-addr: 192.168.218.2:8848
# dataId: ${spring.application.name}-param-flow-rules.json
# namespace: 4c21599b-c836-4f1a-a72f-1260d5474f0f
# username: nacos
Expand All @@ -114,7 +114,7 @@ spring:
# data-type: json
# rule-type: param-flow
transport:
dashboard: 127.0.0.1:8858
dashboard: 192.168.218.2:8858
port: 8712
metric:
file-single-size: 1024 * 1024 * 50
Expand Down
4 changes: 2 additions & 2 deletions taotao-cloud-ddd-assembly/src/main/resources/smart-doc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"serverUrl": "http://127.0.0.1",
"serverUrl": "http://192.168.218.2",
"serverEnv": "http://{{server}}",
"pathPrefix": "",
"isStrict": false,
Expand Down Expand Up @@ -32,7 +32,7 @@
"isReplace": true,
"openUrl": "http://localhost:7700/api",
"debugEnvName": "测试环境",
"debugEnvUrl": "http://127.0.0.1",
"debugEnvUrl": "http://192.168.218.2",
"tornaDebug": false,
"ignoreRequestParams": [
"org.springframework.ui.ModelMap"
Expand Down

0 comments on commit ae105ad

Please sign in to comment.