bonus
/
ahdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

删除modulese-domain,移到api下面

This commit is contained in:
bonus 2024-08-12 13:03:39 +08:00
parent 4ffa82f310
commit d846cdda5a
13 changed files with 92 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmAgreement.java
View File

@ -52,12 +52,6 @@ public class BmAgreement extends BaseEntity implements Serializable {
@ApiModelProperty(value="")
private String contractNumber;
@ApiModelProperty(value="")
private String creator;
@ApiModelProperty(value="")
private String remark;
@ApiModelProperty(value="")
private String settlementTime;

6
bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmCustomer.java
View File

@ -55,12 +55,6 @@ public class BmCustomer implements Serializable {
@ApiModelProperty(value = "联系方式")
private String phone;
/**
* 是否启用0不启用1启用
*/
@ApiModelProperty(value = "是否启用0不启用1启用")
private String isActive;
/**
* 创建时间
*/

5
bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmCustomerType.java
View File

@ -28,11 +28,6 @@ public class BmCustomerType implements Serializable {
@ApiModelProperty(value="往来单位类型")
private String name;
/**
* 是否启用0不启用1启用
*/
@ApiModelProperty(value="是否启用0不启用1启用")
private String isActive;
/**
* 数据所属组织

10
bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmProject.java
View File

@ -76,11 +76,6 @@ public class BmProject extends BaseEntity implements Serializable {
@ApiModelProperty(value = "地址")
private String address;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
private String remarks;
/**
* 材料员
@ -106,11 +101,6 @@ public class BmProject extends BaseEntity implements Serializable {
@ApiModelProperty(value = "创建时间")
private String time;
/**
* 是否启用0不启用1启用
*/
@ApiModelProperty(value = "是否启用0不启用1启用")
private String isActive;
/**
* 经度

104
bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmSupplier.java
View File

@ -1,8 +1,10 @@
package com.bonus.base.api.domain;
import com.bonus.common.core.annotation.Excel;
import com.bonus.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -12,8 +14,9 @@ import java.io.Serializable;
* @author mashuai
* @since 2024-08-09 13:09:16
*/
@Data
@ApiModel("机具供应商管理(BmSupplier)实体类")
public class BmSupplier implements Serializable {
public class BmSupplier extends BaseEntity implements Serializable {
private static final long serialVersionUID = -22518958223068479L;
/** 主键id */
@ -68,106 +71,7 @@ public class BmSupplier implements Serializable {
@ApiModelProperty(value = "数据所属组织")
private Integer companyId;
/** 模糊查询关键字 */
@ApiModelProperty(value = "模糊查询关键字")
private String keyWord;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public String getCompanyMan() {
return companyMan;
}
public void setCompanyMan(String companyMan) {
this.companyMan = companyMan;
}
public String getMainPerson() {
return mainPerson;
}
public void setMainPerson(String mainPerson) {
this.mainPerson = mainPerson;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getScopeBusiness() {
return scopeBusiness;
}
public void setScopeBusiness(String scopeBusiness) {
this.scopeBusiness = scopeBusiness;
}
public String getNotes() {
return notes;
}
public void setNotes(String notes) {
this.notes = notes;
}
public String getPicUrl() {
return picUrl;
}
public void setPicUrl(String picUrl) {
this.picUrl = picUrl;
}
public String getIsActive() {
return isActive;
}
public void setIsActive(String isActive) {
this.isActive = isActive;
}
public Integer getCompanyId() {
return companyId;
}
public void setCompanyId(Integer companyId) {
this.companyId = companyId;
}
public String getKeyWord() {
return keyWord;
}
public void setKeyWord(String keyWord) {
this.keyWord = keyWord;
}
}

8
bonus-auth/src/main/resources/bootstrap.yml
View File

@ -1,9 +1,9 @@
# Tomcat
server:
server:
port: 18081
# Spring
spring:
spring:
application:
# 应用名称
name: bonus-auth
@ -14,11 +14,11 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 192.168.0.56:8848
server-addr: 127.0.0.1:8848
namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
config:
# 配置中心地址
server-addr: 192.168.0.56:8848
server-addr: 127.0.0.1:8848
namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
# 配置文件格式
file-extension: yml

77
bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/web/domain/BaseEntity.java
View File

@ -1,17 +1,18 @@
package com.bonus.common.core.web.domain;
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Setter;
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
/**
* Entity基类
*
*
* @author bonus
*/
@Setter
@ -39,41 +40,80 @@ public class BaseEntity implements Serializable
/** 备注 */
private String remark;
/** 是否启用 */
private String isActive;
/** 创建人 */
private String creator;
/** 请求参数 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private Map<String, Object> params;
public String getSearchValue()
{
public String getSearchValue() {
return searchValue;
}
public String getCreateBy()
{
public void setSearchValue(String searchValue) {
this.searchValue = searchValue;
}
public String getCreateBy() {
return createBy;
}
public Date getCreateTime()
{
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public Date getCreateTime() {
return createTime;
}
public String getUpdateBy()
{
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getUpdateBy() {
return updateBy;
}
public Date getUpdateTime()
{
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
public Date getUpdateTime() {
return updateTime;
}
public String getRemark()
{
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getIsActive() {
return isActive;
}
public void setIsActive(String isActive) {
this.isActive = isActive;
}
public String getCreator() {
return creator;
}
public void setCreator(String creator) {
this.creator = creator;
}
public Map<String, Object> getParams()
{
if (params == null)
@ -83,4 +123,7 @@ public class BaseEntity implements Serializable
return params;
}
public void setParams(Map<String, Object> params) {
this.params = params;
}
}

12
bonus-gateway/src/main/resources/bootstrap.yml
View File

@ -4,7 +4,7 @@ server:
servlet:
context-path: zhgd
# Spring
spring:
spring:
application:
# 应用名称
name: bonus-gateway
@ -15,11 +15,11 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 192.168.0.56:8848
server-addr: 127.0.0.1:8848
namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
config:
# 配置中心地址
server-addr: 192.168.0.56:8848
server-addr: 127.0.0.1:8848
namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
# 配置文件格式
file-extension: yml
@ -31,12 +31,12 @@ spring:
eager: true
transport:
# 控制台地址
dashboard: 192.168.0.56:8848
dashboard: 127.0.0.1:8848
# nacos配置持久化
datasource:
ds1:
nacos:
server-addr: 192.168.0.56:8848
server-addr: 127.0.0.1:8848
namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
dataId: sentinel-bonus-gateway
groupId: DEFAULT_GROUP
@ -52,4 +52,4 @@ system:
#加密组件
jasypt:
encryptor:
password: Encrypt
password: Encrypt

6
bonus-modules/bonus-base/src/main/resources/bootstrap.yml
View File

@ -41,14 +41,14 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 192.168.0.56:8848
server-addr: 127.0.0.1:8848
namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
config:
# 配置中心地址
server-addr: 192.168.0.56:8848
server-addr: 127.0.0.1:8848
namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

6
bonus-modules/bonus-file/src/main/resources/bootstrap.yml
View File

@ -3,7 +3,7 @@ server:
port: 9300
# Spring
spring:
spring:
application:
# 应用名称
name: bonus-file
@ -14,11 +14,11 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 192.168.0.56:8848
server-addr: 127.0.0.1:8848
namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
config:
# 配置中心地址
server-addr: 192.168.0.56:8848
server-addr: 127.0.0.1:8848
namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
# 配置文件格式
file-extension: yml

8
bonus-modules/bonus-system/src/main/resources/bootstrap.yml
View File

@ -3,7 +3,7 @@ server:
port: 18082
# Spring
spring:
spring:
application:
# 应用名称
name: bonus-system
@ -14,14 +14,14 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 192.168.0.56:8848
server-addr: 127.0.0.1:8848
namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
config:
# 配置中心地址
server-addr: 192.168.0.56:8848
server-addr: 127.0.0.1:8848
namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

8
scripts/auth_bootstrap.yml
View File

@ -1,9 +1,9 @@
# Tomcat
server:
server:
port: 18081
# Spring
spring:
spring:
application:
# 应用名称
name: bonus-auth
@ -14,11 +14,11 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 192.168.0.56:8848
server-addr: 127.0.0.1:8848
namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
config:
# 配置中心地址
server-addr: 192.168.0.56:8848
server-addr: 127.0.0.1:8848
namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
# 配置文件格式
file-extension: yml

8
scripts/system_bootstrap.yml
View File

@ -3,7 +3,7 @@ server:
port: 18082
# Spring
spring:
spring:
application:
# 应用名称
name: bonus-system
@ -14,11 +14,11 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 192.168.0.56:8848
server-addr: 127.0.0.1:8848
namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
config:
# 配置中心地址
server-addr: 192.168.0.56:8848
server-addr: 127.0.0.1:8848
namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66
# 配置文件格式
file-extension: yml
@ -28,4 +28,4 @@ spring:
system:
supports:
phoneLogin: true
emailLogin: true
emailLogin: true