diff --git a/Dockerfile b/Dockerfile index 6b59e6e..6095a97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,14 +47,19 @@ ENV KAFKA_VERSION=2.4.0 ENV KAFKA_USERNAME= ENV KAFKA_PASSWORD= ENV KAFKA_SASL_MECHANISM= -ENV IM_ADMIN_API_BASE_URL=http://im-server:6060 +ENV MYSQL_DSN= +ENV REDIS_ADDR=redis.118im.com:30637 +ENV REDIS_DB=2 +ENV REDIS_PASSWORD= +ENV TOKEN_SECRET_KEY=hotgo123 +ENV IM_ADMIN_API_BASE_URL=https://api.118im.com ENV IM_ADMIN_API_SERVICE_ID=hotgo-admin -ENV IM_ADMIN_API_SECRET=8569f5626a54950539eece9f731c9e3bf073daa74af8d23735d19afacac40f4b -ENV IM_INTERNAL_API_BASE_URL=http://im-server:6060 +ENV IM_ADMIN_API_SECRET= +ENV IM_INTERNAL_API_BASE_URL=https://api.118im.com ENV IM_INTERNAL_API_SERVICE_NAME=hotgo-admin -ENV IM_INTERNAL_API_SECRET=8569f5626a54950539eece9f731c9e3bf073daa74af8d23735d19afacac40f4b +ENV IM_INTERNAL_API_SECRET= ENV IM_CONFIG_API_SERVICE_NAME=im-server -ENV IM_CONFIG_API_SECRET=b96832c04dbfb6dd768930ec9f082ecd90d87a1ffdaa493aa070617c48de9097 +ENV IM_CONFIG_API_SECRET= COPY --from=server-build /src/manifest ./manifest COPY --from=server-build /src/hack ./hack diff --git a/server/manifest/config/config.example.yaml b/server/manifest/config/config.example.yaml index 154f5ba..ec69c7e 100644 --- a/server/manifest/config/config.example.yaml +++ b/server/manifest/config/config.example.yaml @@ -192,7 +192,7 @@ token: # 消息队列 queue: switch: true # 队列开关,可选:true|false,默认为true - driver: "disk" # 队列驱动,可选:disk|redis|rocketmq|kafka,默认为disk + driver: "kafka" # 队列驱动,可选:disk|redis|rocketmq|kafka,默认为disk groupName: "hotgo" # mq群组名称 # 磁盘队列 disk: @@ -212,11 +212,11 @@ queue: retry: 0 # 重试次数 logLevel: "info" # rocketmq日志输出级别,可选:all|close|debug|info|warn|error|fatal kafka: - address: ["127.0.0.1:9092"] # kafka地址+端口 + address: ["kafka.118im.com:30835"] # kafka地址+端口 version: "2.4.0" # kafka专属配置,默认2.4.0 username: "" # SASL用户名,未开启认证时留空 password: "" # SASL密码,未开启认证时留空 - mechanism: "SCRAM-SHA-512" # SASL机制,可选:SCRAM-SHA-512|SCRAM-SHA-256 + mechanism: "" # SASL机制,可选:SCRAM-SHA-512|SCRAM-SHA-256 randClient: true # 开启随机生成clientID,可以实现启动多实例同时一起消费相同topic,加速消费能力的特性,默认为true multiConsumer: true # 是否支持创建多个消费者 @@ -224,9 +224,9 @@ queue: # Redis. 配置参考:https://goframe.org/pages/viewpage.action?pageId=1114217 redis: default: - address: "127.0.0.1:6379" + address: "redis.118im.com:30637" db: "2" - pass: "" + pass: "${REDIS_PASSWORD}" idleTimeout: "20" @@ -237,11 +237,11 @@ database: <<: *defaultLogger stdout: true default: - link: "mysql:hotgo:hg123456.@tcp(127.0.0.1:3306)/hotgo?loc=Local&parseTime=true&charset=utf8mb4" + link: "mysql:root:${MYSQL_PASSWORD}@tcp(mysql.118im.com:30306)/hotgo?loc=Local&parseTime=true&charset=utf8mb4" debug: true Prefix: "hg_" imRegistry: - link: "mysql:hotgo:hg123456.@tcp(127.0.0.1:3306)/hotgo?loc=Local&parseTime=true&charset=utf8mb4" + link: "mysql:root:${MYSQL_PASSWORD}@tcp(mysql.118im.com:30306)/hotgo?loc=Local&parseTime=true&charset=utf8mb4" debug: true @@ -309,13 +309,13 @@ hggen: webViewsPath: "../web/src/views/addons/{$name}" # web页面生成路径 imAdminApi: - baseUrl: "http://127.0.0.1:6060" + baseUrl: "https://api.118im.com" serviceId: "hotgo-admin" serviceSecret: "${IM_ADMIN_API_SECRET}" timeout: "5s" imInternalApi: - baseUrl: "http://127.0.0.1:6060" + baseUrl: "https://api.118im.com" serviceName: "hotgo-admin" serviceSecret: "${IM_INTERNAL_API_SECRET}"