From 052acfb12136a6b2398f6a1204ffd8fbe0972273 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Wed, 15 Nov 2023 12:17:03 +0800
Subject: [PATCH] chore: Adjust database schema

---
 docker-cloud/docker-compose.yml               |  2 +-
 docker-cloud/nacos/.env.development           |  2 +-
 .../kicc/common/data/entity/KiccUser.java     |  3 ++
 .../cloud/kicc/system/api/entity/User.java    |  4 +++
 .../kicc/system/api/enums/SubscriberEnum.java | 31 +++++++++++++++++++
 5 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/enums/SubscriberEnum.java

diff --git a/docker-cloud/docker-compose.yml b/docker-cloud/docker-compose.yml
index eff81dc7..17976248 100644
--- a/docker-cloud/docker-compose.yml
+++ b/docker-cloud/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     container_name: nacos
     restart: always
     env_file:
-      - nacos/.env.production
+      - nacos/.env.development
     ports:
       - 8848:8848
       - 9848:9848
diff --git a/docker-cloud/nacos/.env.development b/docker-cloud/nacos/.env.development
index e3e66de9..dd0c7aed 100644
--- a/docker-cloud/nacos/.env.development
+++ b/docker-cloud/nacos/.env.development
@@ -3,7 +3,7 @@ PREFER_HOST_MODE=hostname
 NACOS_APPLICATION_PORT=8848
 SPRING_DATASOURCE_PLATFORM=mysql
 MYSQL_SERVICE_HOST=139.9.72.189
-MYSQL_SERVICE_DB_NAME=kicc_config
+MYSQL_SERVICE_DB_NAME=db_kicc_config
 MYSQL_SERVICE_PORT=8052
 MYSQL_SERVICE_USER=u_kanglai_account
 MYSQL_SERVICE_PASSWORD='$kanglai.<2021>#'
diff --git a/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/KiccUser.java b/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/KiccUser.java
index 064e6a16..85f97e1b 100644
--- a/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/KiccUser.java
+++ b/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/KiccUser.java
@@ -52,6 +52,9 @@ public class KiccUser extends CasUser {
     @ApiModelProperty("地图设计器默认中心点位置")
     private String mapCenter;
 
+    @ApiModelProperty("订阅状态 {@link com.cloud.kicc.system.api.enums.SubscriberEnum }")
+    private String subscriber;
+
     @ApiModelProperty("帐号状态（0正常 1停用）")
     private String status;
 
diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/User.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/User.java
index 3e8f2950..ec8ccd99 100644
--- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/User.java
+++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/User.java
@@ -50,4 +50,8 @@ public class User extends CommonEntity {
     @ApiModelProperty("帐号状态（0正常 1停用）")
     private String status;
 
+    /** {@link com.cloud.kicc.system.api.enums.SubscriberEnum } */
+    @ApiModelProperty("订阅状态")
+    private String subscriber;
+
 }
diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/enums/SubscriberEnum.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/enums/SubscriberEnum.java
new file mode 100644
index 00000000..06c27089
--- /dev/null
+++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/enums/SubscriberEnum.java
@@ -0,0 +1,31 @@
+package com.cloud.kicc.system.api.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ *<p>
+ * 订阅状态
+ *</p>
+ *
+ * @Author: wangxiang4
+ * @Since: 2023/11/15
+ */
+@Getter
+@RequiredArgsConstructor
+public enum SubscriberEnum {
+
+
+	NON("0", "非订阅"),
+
+	BASIC("1", "基础订阅"),
+
+	PREMIUM("2", "高级订阅");
+
+
+	private final String value;
+
+
+	private final String description;
+
+}