diff --git a/default.en.env b/default.en.env index cdc311b..3b123c6 100644 --- a/default.en.env +++ b/default.en.env @@ -152,13 +152,6 @@ MINIO_SECRETKEY=${MINIO_PASSWORD} MINIO_FTP_PORT=8021 MINIO_FTP_PASSIVE_PORT=8523-8529 -## Email -# Default uses transcodegroup email -MAIL_HOST=smtp.transcodegroup.com -MAIL_USERNAME=bus@transcodegroup.com -# Required, need to create password in enterprise email -MAIL_PASSWORD='' - ## ================================ Version, set to latest to use the latest version ================================ # VIDEO, version check date: 2026-1-26 @@ -180,6 +173,6 @@ BUS_GATEWAY_JSATL12_VERSION=23.1.21 # track frontend TRACK_WEB_VERSION=1.66.1 # track backend -TRACK_MAINTAIN_VERSION=1.59.0 +TRACK_MAINTAIN_VERSION=1.59.1 # track gateway TRACK_JTT808_VERSION=1.26.1 diff --git a/default.env b/default.env index 198f7c5..f51d09d 100644 --- a/default.env +++ b/default.env @@ -152,13 +152,6 @@ MINIO_SECRETKEY=${MINIO_PASSWORD} MINIO_FTP_PORT=8021 MINIO_FTP_PASSIVE_PORT=8523-8529 -## 邮件 -# 默认使用transcodegroup的邮箱 -MAIL_HOST=smtp.transcodegroup.com -MAIL_USERNAME=bus@transcodegroup.com -# 必填, 需要去企业邮箱中创建密码 -MAIL_PASSWORD='' - ## ================================ 版本号, 设为latest则使用最新版 ================================ # VIDEO, version check date: 2026-1-26 @@ -179,6 +172,6 @@ BUS_GATEWAY_JSATL12_VERSION=23.1.21 # track前端 TRACK_WEB_VERSION=1.66.1 # track后端 -TRACK_MAINTAIN_VERSION=1.59.0 +TRACK_MAINTAIN_VERSION=1.59.1 # track网关 TRACK_JTT808_VERSION=1.26.1 diff --git a/examples/track-http/.env b/examples/track-http/.env index 08ae58d..1de824e 100644 --- a/examples/track-http/.env +++ b/examples/track-http/.env @@ -11,5 +11,4 @@ REDIS_PASSWORD='12345678' MONGODB_PASSWORD='12345678' RABBITMQ_PASSWORD='12345678' MINIO_PASSWORD='12345678' -MAIL_PASSWORD='12345678' diff --git a/examples/track-https/.env b/examples/track-https/.env index 5ad4f14..590332b 100644 --- a/examples/track-https/.env +++ b/examples/track-https/.env @@ -16,5 +16,4 @@ REDIS_PASSWORD='12345678' MONGODB_PASSWORD='12345678' RABBITMQ_PASSWORD='12345678' MINIO_PASSWORD='12345678' -MAIL_PASSWORD='12345678' diff --git a/maintain/compose.yml b/maintain/compose.yml index ced2161..d7c50d6 100644 --- a/maintain/compose.yml +++ b/maintain/compose.yml @@ -60,15 +60,18 @@ services: # 跨域 逗号分割 - spring_my_cors_origin-patterns=*://${TRACK_HOSTNAME}:[*],*://${SERVER_IP_PUBLIC}:[*] - # Mail-预设了bus的邮箱 - - spring_mail_host=${MAIL_HOST:-smtp.transcodegroup.com} - - spring_mail_username=${MAIL_USERNAME:-smtp.transcodegroup.com} - - spring_mail_password=${MAIL_PASSWORD:?required} - - spring_mail_protocol=smtp - - spring_mail_default-encoding=UTF-8 - - spring_mail_properties_mail_smtp_ssl.enable=true - - spring_mail_properties_mail_smtp_socketFactory_port=465 - - spring_mail_properties_mail_smtp_socketFactory_class=javax.net.ssl.SSLSocketFactory + # 邮箱, 后端镜像已经内置了一个可用的邮箱服务器, 要使用自己的邮箱服务, + # 请参考文档(https://transcodegroup.yuque.com/zu9alr/rorom1/luxvlkvp2qukz8co)复写下面的变量: + # - spring_mail_host=smtp.transcodegroup.com + # - spring_mail_username=bus@transcodegroup.com + # - spring_mail_password=xxxxxx + # - spring_mail_protocol=smtp + # - spring_mail_default-encoding=UTF-8 + # - spring_mail_port=465 + # - spring_mail_properties_mail_smtp_ssl_enable=true + # - spring_mail_properties_mail_smtp_socketFactory_port=465 + # - spring_mail_properties_mail_smtp_socketFactory_class=javax.net.ssl.SSLSocketFactory + logging: driver: "json-file" options: diff --git a/mysql8/initdb/02-maintain-init-data.sql b/mysql8/initdb/02-maintain-init-data.sql index 8b94828..3af1eb7 100644 --- a/mysql8/initdb/02-maintain-init-data.sql +++ b/mysql8/initdb/02-maintain-init-data.sql @@ -221,6 +221,29 @@ INSERT INTO `maintain`.`device_manufacturer` VALUES (1, '43a610ca929d45dea574b11 INSERT INTO `maintain`.`device_product` VALUES (1, '7de049b26def4364a9f3dc3bc60cf029', 'TCG-MDVR', 'TCG-MDVR', '1d3b089c74ca496b8c17cfa77e13a65a', '[\"808-2011\",\"808-2013\",\"808-2016\",\"808-2019\",\"1078-2016\",\"safety-jiangsu\",\"tl\"]', '', 2, 4095, '43a610ca929d45dea574b1122e313e2b', 'TGC', NULL, '', 0, NULL, NULL, 0, '', '[\"TCG-MDVR\"]', 0, '2026-01-21 07:15:23', '2026-01-21 07:16:39'); INSERT INTO `maintain`.`device_product` VALUES (2, 'bf56842a3d80445c96d705e91320a92a', 'GPS Tracker', 'GPS Tracker', 'ed4d3d9b5eda4dfe9a6cdb1327ec1690', '[\"808-2011\",\"808-2013\",\"808-2019\",\"tg\"]', '', 0, 288, '43a610ca929d45dea574b1122e313e2b', 'TGC', NULL, '', 0, NULL, NULL, 0, '', NULL, 0, '2026-01-21 08:02:53', '2026-01-21 08:02:53'); +-- ---------------------------- +-- Records of system_msg_template +-- ---------------------------- + +INSERT INTO `maintain`.`system_msg_template` VALUES ('REGISTER', 0, '注册账号', 'Register an account', 'Register an account', 'Daftarkan akun', NULL, NULL, '您好，您正在申请使用邮箱注册新账号，验证码为：{0}，{1}分钟内有效，为保障帐户安全，请勿向任何人提供此验证码。', 'Hello, you are applying to register a new account using your email address. The verification code is: {0}, valid within {1} minutes. To ensure the security of your account, please do not provide this verification code to anyone.', 'Hello, you are applying to register a new account using your email address. The verification code is: {0}, valid within {1} minutes. To ensure the security of your account, please do not provide this verification code to anyone.', 'Halo, Anda mengajukan permohonan untuk mendaftarkan akun baru menggunakan alamat email Anda. Kode verifikasinya adalah: {0}, berlaku dalam {1} menit. Untuk memastikan keamanan akun Anda, mohon jangan berikan kode verifikasi ini kepada siapa pun.', NULL, NULL, '中车智联', '1435180', '【工物员信息】您好，您正在申请手机注册，验证码为：{1}，{2}分钟内有效，为保障帐户安全，请勿向任何人提供此验证码。', '腾讯', 'user', '手机注册', 0, 1, '2023-01-09 01:56:44', '2025-04-07 02:58:10'); +INSERT INTO `maintain`.`system_msg_template` VALUES ('LOGIN', 0, '验证码登录', 'Verification code login', 'Verification code login', 'Login kode verifikasi', NULL, NULL, '您好，您正在使用邮箱验证码登录，验证码为：{0}, {1}分钟内有效，为保障帐户安全，请勿向任何人提供此验证码。', 'Hello, you are using the email verification code to log in. The verification code is: {0}, valid within {1} minutes. To ensure the security of your account, please do not provide this verification code to anyone.', 'Hello, you are using the email verification code to log in. The verification code is: {0}, valid within {1} minutes. To ensure the security of your account, please do not provide this verification code to anyone.', 'Halo, Anda menggunakan kode verifikasi email untuk masuk. Kode verifikasinya adalah: {0}, berlaku dalam {1} menit. Untuk memastikan keamanan akun Anda, mohon jangan berikan kode verifikasi ini kepada siapa pun.', NULL, NULL, '中车智联', '1435183', '【工物员信息】您好，您正在登录，验证码为：{1}，{2}分钟内有效！若非本人操作，请勿泄露。', '腾讯', 'user', '短信登录', 0, 2, '2023-01-09 01:57:02', '2025-04-07 02:55:34'); +INSERT INTO `maintain`.`system_msg_template` VALUES ('BIND', 0, '绑定认证', 'Bind authentication', 'Bind authentication', 'Autentikasi bind', NULL, NULL, '您好，您正在使用邮箱绑定账号，验证码为：{0}，{1}分钟内有效，为保障帐户安全，请勿向任何人提供此验证码。', 'Hello, you are using your email to bind your account. The verification code is: {0}, valid within {1} minutes. To ensure the security of your account, please do not provide this verification code to anyone.', 'Hello, you are using your email to bind your account. The verification code is: {0}, valid within {1} minutes. To ensure the security of your account, please do not provide this verification code to anyone.', 'Halo, Anda menggunakan email untuk menautkan akun Anda. Kode verifikasinya adalah: {0}, berlaku dalam {1} menit. Untuk memastikan keamanan akun Anda, mohon jangan berikan kode verifikasi ini kepada siapa pun.', NULL, NULL, '中车智联', '1435180', '【工物员信息】您好，您正在申请身份绑定，验证码为：{0}，{1}分钟内有效，为保障帐户安全，请勿向任何人提供此验证码。', '腾讯', 'user', '短信登录', 0, 3, '2023-01-09 01:57:19', '2025-04-07 02:58:10'); +INSERT INTO `maintain`.`system_msg_template` VALUES ('PASSWORD', 0, '忘记密码', 'forget the password', 'forget the password', 'Lupa kata sandi', NULL, NULL, '您好，您正在使用邮箱重置密码，验证码为：{0}，{1}分钟内有效，为保障帐户安全，请勿向任何人提供此验证码。', 'Hello, you are using your email to reset your password. The verification code is: {0}, valid within {1} minutes. To ensure account security, please do not provide this verification code to anyone.', 'Hello, you are using your email to reset your password. The verification code is: {0}, valid within {1} minutes. To ensure account security, please do not provide this verification code to anyone.', 'Halo, Anda menggunakan email untuk mereset kata sandi Anda. Kode verifikasinya adalah: {0}, berlaku dalam {1} menit. Untuk memastikan keamanan akun, mohon jangan berikan kode verifikasi ini kepada siapa pun.', NULL, NULL, '中车智联', '1435181', '【工物员信息】您好, 您正在重置密码，验证码为：{1}，{2}分钟有效，为保障帐户安全，请勿向任何人提供此验证码。', '腾讯', 'user', '重置密码', 0, 4, '2023-01-09 01:57:33', '2025-04-07 02:58:10'); +INSERT INTO `maintain`.`system_msg_template` VALUES ('AUTHORIZATION', 0, '身份验证', 'Authentication', 'Authentication', 'Autentikasi', NULL, NULL, '您好，您正在使用邮箱进行身份认证，验证码为：{0}，{1}分钟内有效，为保障帐户安全，请勿向任何人提供此验证码。', 'Hello, you are using your email address for identity authentication. The verification code is: {0}, valid within {1} minutes. To ensure the security of your account, please do not provide this verification code to anyone.', 'Hello, you are using your email address for identity authentication. The verification code is: {0}, valid within {1} minutes. To ensure the security of your account, please do not provide this verification code to anyone.', 'Halo, Anda menggunakan alamat email untuk autentikasi identitas. Kode verifikasinya adalah: {0}, berlaku dalam {1} menit. Untuk memastikan keamanan akun Anda, mohon jangan berikan kode verifikasi ini kepada siapa pun.', NULL, NULL, '中车智联', '1660577', '【工物员信息】您好，您正在申请身份验证，验证码为：{0}，{1}分钟内有效，为保障帐户安全，请勿向任何人提供此验证码。', '腾讯', 'user', '身份验证', 0, 5, '2023-01-09 01:57:48', '2025-04-07 02:58:10'); +INSERT INTO `maintain`.`system_msg_template` VALUES ('CHANGE_PASSWORD', 0, '修改密码', 'change Password', 'change Password', 'Ubah kata sandi', NULL, NULL, '您好，您正在使用邮箱重置密码，验证码为：{0}，{1}分钟内有效，为保障帐户安全，请勿向任何人提供此验证码。', 'Hello, you are using your email to reset your password. The verification code is: {0}, valid within {1} minutes. To ensure account security, please do not provide this verification code to anyone.', 'Hello, you are using your email to reset your password. The verification code is: {0}, valid within {1} minutes. To ensure account security, please do not provide this verification code to anyone.', 'Halo, Anda menggunakan email untuk mereset kata sandi Anda. Kode verifikasinya adalah: {0}, berlaku dalam {1} menit. Untuk memastikan keamanan akun, mohon jangan berikan kode verifikasi ini kepada siapa pun.', NULL, NULL, '中车智联', '1435181', '【工物员信息】您好, 您正在重置密码，验证码为：{1}，{2}分钟有效，为保障帐户安全，请勿向任何人提供此验证码。', '腾讯', 'user', '重置密码', 0, 4, '2023-03-15 05:55:42', '2025-04-07 02:58:10'); +INSERT INTO `maintain`.`system_msg_template` VALUES ('NEW_PRICE', 0, '新的报价', 'new offer', 'new offer', 'Penawaran baru', NULL, NULL, '您好，工单编号为{0}的工单,有新的报价，请您关注并及时处理。', 'Hello, the work order with work order number {0} has a new quotation. Please pay attention and process it in time.', 'Hello, the work order with work order number {0} has a new quotation. Please pay attention and process it in time.', 'Halo, perintah kerja dengan nomor perintah kerja {0} memiliki penawaran baru. Harap perhatikan dan proses tepat waktu.', NULL, NULL, '中车智联', '1601786', '【工物员信息】您好，工单编号为{1},发单人拒绝了您的报价，请您关注并及时处理。', '腾讯', 'order', '报价人-报价-发单人', 0, 0, '2022-11-08 10:48:24', '2025-04-07 02:58:10'); +INSERT INTO `maintain`.`system_msg_template` VALUES ('AGREE_PRICE', 0, '同意报价', 'Agree to quote', 'Agree to quote', 'Setujui penawaran', NULL, NULL, '您好，工单编号为{0}的工单，发单人同意了您报价, 请您关注并及时处理。', 'Hello, the issuer of the work order with work order number {0} has agreed to your quotation. Please pay attention and process it in time.', 'Hello, the issuer of the work order with work order number {0} has agreed to your quotation. Please pay attention and process it in time.', 'Halo, penerbit perintah kerja dengan nomor perintah kerja {0} telah menyetujui penawaran Anda. Harap perhatikan dan proses penawaran Anda tepat waktu.', NULL, NULL, '中车智联', '1601790', '【工物员信息】您好，工单编号为{1}，发单人同意了您报价, 请您关注并及时处理。', '腾讯', 'order', '发单人-同意报价-报价人', 0, 0, '2022-11-08 10:49:17', '2025-04-07 02:58:11'); +INSERT INTO `maintain`.`system_msg_template` VALUES ('REJECT_PRICE', 0, '拒绝报价', 'reject offer', 'reject offer', 'Tolak penawaran', NULL, NULL, '您好，工单编号为{0}的工单,发单人拒绝了您的报价，请您关注并及时处理。', 'Hello, the issuer of the work order with work order number {0} has rejected your quotation. Please pay attention and handle it in time.', 'Hello, the issuer of the work order with work order number {0} has rejected your quotation. Please pay attention and handle it in time.', 'Halo, penerbit perintah kerja dengan nomor perintah kerja {0} telah menolak penawaran Anda. Harap perhatikan dan tangani hal ini tepat waktu.', NULL, NULL, '中车智联', '1601794', '【工物员信息】您好，工单编号为{1},发单人拒绝了您的报价，请您关注并及时处理。', '腾讯', 'order', '发单人-拒绝报价-报价人', 0, 0, '2022-11-08 10:49:26', '2025-04-07 02:58:12'); +INSERT INTO `maintain`.`system_msg_template` VALUES ('ASSIGN_ORGANIZE', 0, '派单提醒', 'Dispatch order reminder', 'Dispatch order reminder', 'Pengingat pengiriman pesanan', NULL, NULL, '您有一条新的工单{0}，请您关注并及时处理。', 'You have a new work order {0}, please pay attention to it and handle it in time.', 'You have a new work order {0}, please pay attention to it and handle it in time.', 'Anda memiliki perintah kerja baru {0}, harap perhatikan dan tangani tepat waktu.', NULL, NULL, '中车智联', '1437477', '【工物员信息】您好，您有一条新的工单，工单编号：{1}，工单详情：{2}，预约时间：{3}，请您关注并及时处理。', '腾讯', 'order', '指派人-指派企业-接单企业管理人员', 0, 0, '2022-11-09 09:53:03', '2025-04-07 02:58:12'); +INSERT INTO `maintain`.`system_msg_template` VALUES ('ASSIGN_ENGINEER', 0, '派单提醒', 'Dispatch order reminder', 'Dispatch order reminder', 'Pengingat pengiriman pesanan', NULL, NULL, '您有一条新的工单{0}，请您关注并及时处理。', 'You have a new work order {0}, please pay attention to it and handle it in time.', 'You have a new work order {0}, please pay attention to it and handle it in time.', 'Anda memiliki perintah kerja baru {0}, harap perhatikan dan tangani tepat waktu.', NULL, NULL, '中车智联', '1437477', '【工物员信息】您好，您有一条新的工单，工单编号：{1}，工单详情：{2}，预约时间：{3}，请您关注并及时处理。', '腾讯', 'order', '指派人-指派工程师-工程师', 0, 0, '2022-06-09 08:56:07', '2025-04-07 02:58:12'); +INSERT INTO `maintain`.`system_msg_template` VALUES ('REASSIGN', 0, '接单改派', 'Order reassignment', 'Order reassignment', 'Penugasan ulang pesanan', NULL, NULL, '您有一条工单{0}被工程师拒绝接单, 请关注并及时处理。', 'You have a work order {0} that was refused by the engineer. Please pay attention and handle it in time.', 'You have a work order {0} that was refused by the engineer. Please pay attention and handle it in time.', 'Anda memiliki perintah kerja {0} yang ditolak oleh teknisi. Harap perhatikan dan tangani perintah tersebut tepat waktu.', NULL, NULL, '中车智联', '1480559', '【工物员信息】您好，由您指派的工单编号：{1}的工单，已被工程师拒接，请您重新指派。', '腾讯', 'order', '工程师-拒绝接单-指派人员', 0, 0, '2022-07-19 14:22:53', '2025-04-07 02:58:12'); +INSERT INTO `maintain`.`system_msg_template` VALUES ('DONE', 0, '签单提醒', 'Signing reminder', 'Signing reminder', 'Pengingat penandatanganan', NULL, NULL, '您有一条工单{0}需要您签单，请您关注并及时处理。', 'You have a work order {0} that requires your signature. Please pay attention to it and handle it in a timely manner.', 'You have a work order {0} that requires your signature. Please pay attention to it and handle it in a timely manner.', 'Anda memiliki perintah kerja {0} yang memerlukan tanda tangan Anda. Harap perhatikan dan tangani perintah tersebut tepat waktu.', NULL, NULL, '中车智联', '1437482', '【工物员信息】您好，您创建的工单编号：{1}的工单，工程师{2}已发起签单，联系电话：{3}，请您关注并及时处理。', '腾讯', 'order', '工程师-发起签单-发单人', 0, 0, '2022-06-09 08:56:07', '2025-04-07 02:58:12'); +INSERT INTO `maintain`.`system_msg_template` VALUES ('ACCEPTANCE', 0, '签单提醒', 'Signing reminder', 'Signing reminder', 'Pengingat penandatanganan', NULL, NULL, '工单{0}签收完成，谢谢您的支持。', 'Work order {0} has been signed for, thank you for your support.', 'Work order {0} has been signed for, thank you for your support.', 'Perintah kerja {0} telah ditandatangani, terima kasih atas dukungan Anda.', NULL, NULL, '中车智联', '1437485', '【工物员信息】您好，您发起签单工单编号：{1}的工单，通过工单发起人验收，订单完成，谢谢您的支持。', '腾讯', 'order', '发单人-完成签单-通知工程师', 0, 0, '2022-06-10 06:36:19', '2025-04-07 02:58:12'); +INSERT INTO `maintain`.`system_msg_template` VALUES ('RECALL', 0, '拒绝签单', 'Refuse to sign the order', 'Refuse to sign the order', 'Tolak untuk menandatangani pesanan', NULL, NULL, '工单{0}被驳回，请您关注并及时处理。', 'Work order {0} has been rejected. Please pay attention and handle it in time.', 'Work order {0} has been rejected. Please pay attention and handle it in time.', 'Perintah kerja {0} telah ditolak. Harap perhatikan dan tangani dengan tepat waktu.', NULL, NULL, '中车智联', '1437487', '【工物员信息】您好，您发起签单工单编号：{1}的工单，未通过工单发起人验收，现已被驳回，请您关注并及时处理。', '腾讯', 'order', '发单人-驳回工单-通知工程师', 0, 0, '2022-06-09 08:56:07', '2025-04-07 02:58:12'); +INSERT INTO `maintain`.`system_msg_template` VALUES ('ORDER_NEW_BATCH', 30, '派单提醒', 'Dispatch order reminder', 'Dispatch order reminder', 'Pengingat pengiriman pesanan', NULL, NULL, '您有{0}条新的工单，请您关注并及时处理。', 'You have {0} new work orders, please pay attention and handle them in time.', 'You have {0} new work orders, please pay attention and handle them in time.', 'Anda memiliki {0} perintah kerja baru, harap perhatikan dan tangani tepat waktu.', NULL, NULL, NULL, NULL, NULL, '极光', 'order', '指派人-指派企业-接单企业管理人员', 0, 0, '2022-11-17 07:20:06', '2025-04-07 02:58:13'); +INSERT INTO `maintain`.`system_msg_template` VALUES ('APPLY_JOIN_GROUP', 30, '申请加入组织', 'Apply to join the organization', 'Apply to join the organization', 'Daftar untuk bergabung dengan organisasi', NULL, NULL, '{0} 申请加入组织 {1}, 请您关注并及时处理。', '{0} applied to join the organization {1}, please pay attention and process it in time.', '{0} applied to join the organization {1}, please pay attention and process it in time.', '{0} mengajukan permohonan untuk bergabung dengan organisasi {1}, mohon diperhatikan dan diproses tepat waktu.', NULL, NULL, NULL, NULL, NULL, '极光', 'organize', '组织要求成员加入自己组织', 0, 0, '2022-11-14 08:13:57', '2025-04-07 02:58:13'); +INSERT INTO `maintain`.`system_msg_template` VALUES ('INVITE_JOIN_GROUP', 30, '组织邀请', 'Organization invitation', 'Organization invitation', 'Undangan organisasi', NULL, NULL, '{0} 邀请您加入组织 {1}, 请您关注并及时处理。', '{0} invites you to join the organization {1}, please pay attention and handle it in time.', '{0} invites you to join the organization {1}, please pay attention and handle it in time.', '{0} mengundang Anda untuk bergabung dengan organisasi {1}, mohon perhatikan dan tangani tepat waktu.', NULL, NULL, NULL, NULL, NULL, '极光', 'organize', '组织要求成员加入自己组织', 0, 0, '2022-11-14 08:40:10', '2025-04-07 02:58:13'); + SET FOREIGN_KEY_CHECKS = 1; diff --git a/setup-services.sh b/setup-services.sh index 9ad55f1..12af6da 100755 --- a/setup-services.sh +++ b/setup-services.sh @@ -229,7 +229,7 @@ else openssl rand -base64 16 | tr -dc 'a-zA-Z0-9' | head -c 16 } - PASS_VARS=("MYSQL_PASSWORD" "REDIS_PASSWORD" "RABBITMQ_PASSWORD" "MONGODB_PASSWORD" "MINIO_PASSWORD" "MAIL_PASSWORD") + PASS_VARS=("MYSQL_PASSWORD" "REDIS_PASSWORD" "RABBITMQ_PASSWORD" "MONGODB_PASSWORD" "MINIO_PASSWORD") echo -e "${BLUE}Checking password configurations...${NC}"