From 76d21acf9f8324044d48f6f74ec27eb4ea2bbf06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E5=8B=A4=E6=B0=91?= Date: Wed, 31 Jul 2024 19:31:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E8=B4=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trust/java/imserver/controller/sys/v1/TenantV1Controller.java | 3 ++- .../cn/org/bjca/trust/java/imserver/entitys/sys/TenantEntity.java | 1 + src/main/resources/application.properties | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/org/bjca/trust/java/imserver/controller/sys/v1/TenantV1Controller.java b/src/main/java/cn/org/bjca/trust/java/imserver/controller/sys/v1/TenantV1Controller.java index faed1d8..feea395 100644 --- a/src/main/java/cn/org/bjca/trust/java/imserver/controller/sys/v1/TenantV1Controller.java +++ b/src/main/java/cn/org/bjca/trust/java/imserver/controller/sys/v1/TenantV1Controller.java @@ -39,7 +39,8 @@ public class TenantV1Controller { t.setUserEmail(tenant.getUserEmail()); t.setUserName(tenant.getUserName()); t.setUserPhone(tenant.getUserPhone()); - t.setTenantNo(TimeHelper.getTimeString("yyyyMMddHHmm") + (new Random().nextInt(899999999) + 100000000)); + t.setAdmin(tenant.getTenantNo().isBlank()); + t.setTenantNo(!tenant.getTenantNo().isBlank() ? tenant.getTenantNo() : TimeHelper.getTimeString("yyyyMMddHHmm") + (new Random().nextInt(899999999) + 100000000)); tenantRepository.save(t); // RabbitMQHelper.requestByGetAndParams("http://114.115.203.60:15672/api/vhosts/" + appid, ""); diff --git a/src/main/java/cn/org/bjca/trust/java/imserver/entitys/sys/TenantEntity.java b/src/main/java/cn/org/bjca/trust/java/imserver/entitys/sys/TenantEntity.java index f1d7054..a66fbf9 100644 --- a/src/main/java/cn/org/bjca/trust/java/imserver/entitys/sys/TenantEntity.java +++ b/src/main/java/cn/org/bjca/trust/java/imserver/entitys/sys/TenantEntity.java @@ -15,4 +15,5 @@ public class TenantEntity extends AbstractBaseTimeEntity { private String userName; private String userPhone; private String userEmail; + private boolean isAdmin; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 531b178..0f0532c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,11 +3,11 @@ server.port=4561 #???????????? spring.jpa.hibernate.ddl-auto=update #mysql????????????? -spring.datasource.url = jdbc:mysql://114.115.203.60:3306/szyx-im?serverTimezone=Asia/Shanghai +spring.datasource.url = jdbc:mysql://39.107.53.187:3306/szyx-im?serverTimezone=Asia/Shanghai #?????? spring.datasource.username = szyx-im #????? -spring.datasource.password = nGFYwCMYMNELCeRp +spring.datasource.password = xdrKhnaLrSBbrmzx #mysql??????????? spring.datasource.driver-class-name = com.mysql.cj.jdbc.Driver #jpa?????????Hibernate?sql(??)