Browse Source

chore: Adjust database schema

master
wangxiang 2 years ago
parent
commit
052acfb121
No known key found for this signature in database
GPG Key ID: 1BA7946AB6B232E4
  1. 2
      docker-cloud/docker-compose.yml
  2. 2
      docker-cloud/nacos/.env.development
  3. 3
      kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/KiccUser.java
  4. 4
      kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/User.java
  5. 31
      kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/enums/SubscriberEnum.java

2
docker-cloud/docker-compose.yml

@ -12,7 +12,7 @@ services:
container_name: nacos container_name: nacos
restart: always restart: always
env_file: env_file:
- nacos/.env.production - nacos/.env.development
ports: ports:
- 8848:8848 - 8848:8848
- 9848:9848 - 9848:9848

2
docker-cloud/nacos/.env.development

@ -3,7 +3,7 @@ PREFER_HOST_MODE=hostname
NACOS_APPLICATION_PORT=8848 NACOS_APPLICATION_PORT=8848
SPRING_DATASOURCE_PLATFORM=mysql SPRING_DATASOURCE_PLATFORM=mysql
MYSQL_SERVICE_HOST=139.9.72.189 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_PORT=8052
MYSQL_SERVICE_USER=u_kanglai_account MYSQL_SERVICE_USER=u_kanglai_account
MYSQL_SERVICE_PASSWORD='$kanglai.<2021>#' MYSQL_SERVICE_PASSWORD='$kanglai.<2021>#'

3
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("地图设计器默认中心点位置") @ApiModelProperty("地图设计器默认中心点位置")
private String mapCenter; private String mapCenter;
@ApiModelProperty("订阅状态 {@link com.cloud.kicc.system.api.enums.SubscriberEnum }")
private String subscriber;
@ApiModelProperty("帐号状态(0正常 1停用)") @ApiModelProperty("帐号状态(0正常 1停用)")
private String status; private String status;

4
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停用)") @ApiModelProperty("帐号状态(0正常 1停用)")
private String status; private String status;
/** {@link com.cloud.kicc.system.api.enums.SubscriberEnum } */
@ApiModelProperty("订阅状态")
private String subscriber;
} }

31
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;
}
Loading…
Cancel
Save