blade/BladeX
1
0
Fork 0
mirror of https://github.com/chillzhuang/SpringBlade.git synced 2024-12-22 09:09:24 +08:00
Code Issues Projects Releases Wiki Activity

🎉 2.3.1.RELEASE

Browse Source
This commit is contained in:
smallchill 2019-05-18 14:47:30 +08:00
parent 4324d6672b
commit 812d42f3f3
37 changed files with 141 additions and 539 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -17,6 +17,9 @@
* 稳定生产了一年，经历了从Camden -> Greenwich的技术架构，也经历了从fat jar -> docker -> k8s + jenkins的部署架构
* 项目分包明确，规范微服务的开发模式，使包与包之间的分工清晰。
## 架构图
<img src="https://gitee.com/smallc/SpringBlade/raw/master/pic/springblade-framework.png"/>
## 工程结构
```
SpringBlade

2
blade-auth/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId>
<version>2.3.0</version>
<version>2.3.1</version>
</parent>
<artifactId>blade-auth</artifactId>

2
blade-common/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId>
<version>2.3.0</version>
<version>2.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-gateway/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId>
<version>2.3.0</version>
<version>2.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-admin/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
<version>2.3.0</version>
<version>2.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-develop/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>blade-ops</artifactId>
<version>2.3.0</version>
<version>2.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

125
blade-ops/blade-develop/src/main/java/org/springblade/system/controller/TenantController.java
View File

@ -1,125 +0,0 @@
/**
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.system.controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import javax.validation.Valid;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.system.feign.IDictClient;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestParam;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.system.entity.Tenant;
import org.springblade.system.vo.TenantVO;
import org.springblade.system.wrapper.TenantWrapper;
import org.springblade.system.service.ITenantService;
import org.springblade.core.boot.ctrl.BladeController;
import java.util.List;
/**
* 控制器
*
* @author Blade
* @since 2019-04-17
*/
@RestController
@AllArgsConstructor
@RequestMapping("/tenant")
@Api(value = "", tags = "接口")
public class TenantController extends BladeController {
private ITenantService tenantService;
private IDictClient dictClient;
/**
* 详情
*/
@GetMapping("/detail")
@ApiOperation(value = "详情", notes = "传入tenant", position = 1)
public R<TenantVO> detail(Tenant tenant) {
Tenant detail = tenantService.getOne(Condition.getQueryWrapper(tenant));
TenantWrapper tenantWrapper = new TenantWrapper(dictClient);
return R.data(tenantWrapper.entityVO(detail));
}
/**
* 分页
*/
@GetMapping("/list")
@ApiOperation(value = "分页", notes = "传入tenant", position = 2)
public R<IPage<TenantVO>> list(Tenant tenant, Query query) {
IPage<Tenant> pages = tenantService.page(Condition.getPage(query), Condition.getQueryWrapper(tenant));
TenantWrapper tenantWrapper = new TenantWrapper(dictClient);
return R.data(tenantWrapper.pageVO(pages));
}
/**
* 自定义分页
*/
@GetMapping("/page")
@ApiOperation(value = "分页", notes = "传入tenant", position = 3)
public R<IPage<TenantVO>> page(TenantVO tenant, Query query) {
IPage<TenantVO> pages = tenantService.selectTenantPage(Condition.getPage(query), tenant);
return R.data(pages);
}
/**
* 新增
*/
@PostMapping("/save")
@ApiOperation(value = "新增", notes = "传入tenant", position = 4)
public R save(@Valid @RequestBody Tenant tenant) {
return R.status(tenantService.save(tenant));
}
/**
* 修改
*/
@PostMapping("/update")
@ApiOperation(value = "修改", notes = "传入tenant", position = 5)
public R update(@Valid @RequestBody Tenant tenant) {
return R.status(tenantService.updateById(tenant));
}
/**
* 新增或修改
*/
@PostMapping("/submit")
@ApiOperation(value = "新增或修改", notes = "传入tenant", position = 6)
public R submit(@Valid @RequestBody Tenant tenant) {
return R.status(tenantService.saveOrUpdate(tenant));
}
/**
* 删除
*/
@PostMapping("/remove")
@ApiOperation(value = "逻辑删除", notes = "传入ids", position = 7)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(tenantService.deleteLogic(Func.toIntList(ids)));
}
}

33
blade-ops/blade-develop/src/main/java/org/springblade/system/dto/TenantDTO.java
View File

@ -1,33 +0,0 @@
/**
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.system.dto;
import org.springblade.system.entity.Tenant;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 数据传输对象实体类
*
* @author Blade
* @since 2019-04-17
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class TenantDTO extends Tenant {
private static final long serialVersionUID = 1L;
}

61
blade-ops/blade-develop/src/main/java/org/springblade/system/entity/Tenant.java
View File

@ -1,61 +0,0 @@
/**
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.system.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import org.springblade.core.mp.base.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* 实体类
*
* @author Blade
* @since 2019-04-17
*/
@Data
@TableName("blade_tenant")
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "Tenant对象", description = "Tenant对象")
public class Tenant extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 租户名称
*/
@ApiModelProperty(value = "租户名称")
private String tenantName;
/**
* 联系人
*/
@ApiModelProperty(value = "联系人")
private String linkman;
/**
* 联系电话
*/
@ApiModelProperty(value = "联系电话")
private String contactNumber;
/**
* 联系地址
*/
@ApiModelProperty(value = "联系地址")
private String address;
}

41
blade-ops/blade-develop/src/main/java/org/springblade/system/mapper/TenantMapper.java
View File

@ -1,41 +0,0 @@
/**
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.system.mapper;
import org.springblade.system.entity.Tenant;
import org.springblade.system.vo.TenantVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;
/**
* Mapper 接口
*
* @author Blade
* @since 2019-04-17
*/
public interface TenantMapper extends BaseMapper<Tenant> {
/**
* 自定义分页
*
* @param page
* @param tenant
* @return
*/
List<TenantVO> selectTenantPage(IPage page, TenantVO tenant);
}

25
blade-ops/blade-develop/src/main/java/org/springblade/system/mapper/TenantMapper.xml
View File

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.system.mapper.TenantMapper">
<!-- 通用查询映射结果 -->
<resultMap id="tenantResultMap" type="org.springblade.system.entity.Tenant">
<result column="id" property="id"/>
<result column="create_user" property="createUser"/>
<result column="create_time" property="createTime"/>
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
<result column="status" property="status"/>
<result column="is_deleted" property="isDeleted"/>
<result column="tenant_name" property="tenantName"/>
<result column="linkman" property="linkman"/>
<result column="contact_number" property="contactNumber"/>
<result column="address" property="address"/>
</resultMap>
<select id="selectTenantPage" resultMap="tenantResultMap">
select * from blade_tenant where is_deleted = 0
</select>
</mapper>

40
blade-ops/blade-develop/src/main/java/org/springblade/system/service/ITenantService.java
View File

@ -1,40 +0,0 @@
/**
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.system.service;
import org.springblade.system.entity.Tenant;
import org.springblade.system.vo.TenantVO;
import org.springblade.core.mp.base.BaseService;
import com.baomidou.mybatisplus.core.metadata.IPage;
/**
* 服务类
*
* @author Blade
* @since 2019-04-17
*/
public interface ITenantService extends BaseService<Tenant> {
/**
* 自定义分页
*
* @param page
* @param tenant
* @return
*/
IPage<TenantVO> selectTenantPage(IPage<TenantVO> page, TenantVO tenant);
}

40
blade-ops/blade-develop/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
View File

@ -1,40 +0,0 @@
/**
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.system.service.impl;
import org.springblade.system.entity.Tenant;
import org.springblade.system.vo.TenantVO;
import org.springblade.system.mapper.TenantMapper;
import org.springblade.system.service.ITenantService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
/**
* 服务实现类
*
* @author Blade
* @since 2019-04-17
*/
@Service
public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> implements ITenantService {
@Override
public IPage<TenantVO> selectTenantPage(IPage<TenantVO> page, TenantVO tenant) {
return page.setRecords(baseMapper.selectTenantPage(page, tenant));
}
}

35
blade-ops/blade-develop/src/main/java/org/springblade/system/vo/TenantVO.java
View File

@ -1,35 +0,0 @@
/**
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.system.vo;
import org.springblade.system.entity.Tenant;
import lombok.Data;
import lombok.EqualsAndHashCode;
import io.swagger.annotations.ApiModel;
/**
* 视图实体类
*
* @author Blade
* @since 2019-04-17
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "TenantVO对象", description = "TenantVO对象")
public class TenantVO extends Tenant {
private static final long serialVersionUID = 1L;
}

49
blade-ops/blade-develop/src/main/java/org/springblade/system/wrapper/TenantWrapper.java
View File

@ -1,49 +0,0 @@
/**
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.system.wrapper;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.system.feign.IDictClient;
import org.springblade.system.entity.Tenant;
import org.springblade.system.vo.TenantVO;
/**
* 包装类,返回视图层所需的字段
*
* @author Blade
* @since 2019-04-17
*/
@AllArgsConstructor
public class TenantWrapper extends BaseEntityWrapper<Tenant, TenantVO> {
private IDictClient dictClient;
@Override
public TenantVO entityVO(Tenant tenant) {
TenantVO tenantVO = BeanUtil.copy(tenant, TenantVO.class);
/*R<String> dict = dictClient.getValue("tenant" , tenantVO.getCategory());
if (dict.isSuccess()) {
String categoryName = dict.getData();
tenantVO.setCategoryName(categoryName);
}*/
return tenantVO;
}
}

11
blade-ops/blade-develop/src/main/java/templates/sql/tenant.menu.mysql
View File

@ -1,11 +0,0 @@
INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
VALUES (0, 'tenant', '租户管理', 'menu', '/system/tenant', NULL, 1, 1, 0, 1, NULL, 0);
set @parentid = (SELECT LAST_INSERT_ID());
INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
VALUES (@parentid, 'tenant_add', '新增', 'add', '/system/tenant/add', 'plus', 1, 2, 1, 1, NULL, 0);
INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
VALUES (@parentid, 'tenant_edit', '修改', 'edit', '/system/tenant/edit', 'form', 2, 2, 1, 2, NULL, 0);
INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
VALUES (@parentid, 'tenant_delete', '删除', 'delete', '/api/blade-system/tenant/remove', 'delete', 3, 2, 1, 3, NULL, 0);
INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
VALUES (@parentid, 'tenant_view', '查看', 'view', '/system/tenant/view', 'file-text', 4, 2, 1, 2, NULL, 0);

2
blade-ops/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId>
<version>2.3.0</version>
<version>2.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-service-api/blade-desk-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
<version>2.3.0</version>
<version>2.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

9
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/entity/Notice.java
View File

@ -15,6 +15,8 @@
*/
package org.springblade.desk.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -35,6 +37,13 @@ public class Notice extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "主键id")
private Integer id;
/**
* 标题
*/

2
blade-service-api/blade-dict-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
<version>2.3.0</version>
<version>2.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-service-api/blade-system-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
<version>2.3.0</version>
<version>2.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

121
blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/AuthClient.java
View File

@ -15,6 +15,8 @@
*/
package org.springblade.system.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -34,63 +36,70 @@ import org.springblade.core.mp.base.BaseEntity;
@ApiModel(value = "Client对象", description = "Client对象")
public class AuthClient extends BaseEntity {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
/**
* 客户端id
*/
@ApiModelProperty(value = "客户端id")
private String clientId;
/**
* 客户端密钥
*/
@ApiModelProperty(value = "客户端密钥")
private String clientSecret;
/**
* 资源集合
*/
@ApiModelProperty(value = "资源集合")
private String resourceIds;
/**
* 授权范围
*/
@ApiModelProperty(value = "授权范围")
private String scope;
/**
* 授权类型
*/
@ApiModelProperty(value = "授权类型")
private String authorizedGrantTypes;
/**
* 回调地址
*/
@ApiModelProperty(value = "回调地址")
private String webServerRedirectUri;
/**
* 权限
*/
@ApiModelProperty(value = "权限")
private String authorities;
/**
* 令牌过期秒数
*/
@ApiModelProperty(value = "令牌过期秒数")
private Integer accessTokenValidity;
/**
* 刷新令牌过期秒数
*/
@ApiModelProperty(value = "刷新令牌过期秒数")
private Integer refreshTokenValidity;
/**
* 附加说明
*/
@ApiModelProperty(value = "附加说明")
private String additionalInformation;
/**
* 自动授权
*/
@ApiModelProperty(value = "自动授权")
private String autoapprove;
/**
* 主键id
*/
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "主键id")
private Integer id;
/**
* 客户端id
*/
@ApiModelProperty(value = "客户端id")
private String clientId;
/**
* 客户端密钥
*/
@ApiModelProperty(value = "客户端密钥")
private String clientSecret;
/**
* 资源集合
*/
@ApiModelProperty(value = "资源集合")
private String resourceIds;
/**
* 授权范围
*/
@ApiModelProperty(value = "授权范围")
private String scope;
/**
* 授权类型
*/
@ApiModelProperty(value = "授权类型")
private String authorizedGrantTypes;
/**
* 回调地址
*/
@ApiModelProperty(value = "回调地址")
private String webServerRedirectUri;
/**
* 权限
*/
@ApiModelProperty(value = "权限")
private String authorities;
/**
* 令牌过期秒数
*/
@ApiModelProperty(value = "令牌过期秒数")
private Integer accessTokenValidity;
/**
* 刷新令牌过期秒数
*/
@ApiModelProperty(value = "刷新令牌过期秒数")
private Integer refreshTokenValidity;
/**
* 附加说明
*/
@ApiModelProperty(value = "附加说明")
private String additionalInformation;
/**
* 自动授权
*/
@ApiModelProperty(value = "自动授权")
private String autoapprove;
}

9
blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Param.java
View File

@ -15,6 +15,8 @@
*/
package org.springblade.system.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -35,6 +37,13 @@ public class Param extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "主键id")
private Integer id;
/**
* 参数名
*/

9
blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java
View File

@ -15,6 +15,8 @@
*/
package org.springblade.system.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -35,6 +37,13 @@ public class Tenant extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "主键id")
private Integer id;
/**
* 租户编号
*/

2
blade-service-api/blade-user-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
<version>2.3.0</version>
<version>2.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

10
blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java
View File

@ -15,7 +15,10 @@
*/
package org.springblade.system.user.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.TenantEntity;
@ -34,6 +37,13 @@ public class User extends TenantEntity {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "主键id")
private Integer id;
/**
* 账号
*/

4
blade-service-api/pom.xml
View File

@ -5,13 +5,13 @@
<parent>
<artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId>
<version>2.3.0</version>
<version>2.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>blade-service-api</artifactId>
<name>${project.artifactId}</name>
<version>2.3.0</version>
<version>2.3.1</version>
<packaging>pom</packaging>
<description>SpringBlade 微服务API集合</description>

2
blade-service/blade-desk/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>blade-service</artifactId>
<version>2.3.0</version>
<version>2.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-service/blade-log/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId>
<version>2.3.0</version>
<version>2.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-service/blade-system/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId>
<version>2.3.0</version>
<version>2.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
View File

@ -30,7 +30,7 @@
<!-- 通用查询结果列 -->
<sql id="baseColumnList">
select
id, code, parent_code, name, alias, path, source, sort, category, action, is_open, remark, is_deleted
id, code, parent_id, name, alias, path, source, sort, category, action, is_open, remark, is_deleted
</sql>
<select id="selectMenuPage" resultMap="menuResultMap">

2
blade-service/blade-user/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId>
<version>2.3.0</version>
<version>2.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
blade-service/pom.xml
View File

@ -7,12 +7,12 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>SpringBlade</artifactId>
<version>2.3.0</version>
<version>2.3.1</version>
</parent>
<artifactId>blade-service</artifactId>
<name>${project.artifactId}</name>
<version>2.3.0</version>
<version>2.3.1</version>
<packaging>pom</packaging>
<description>SpringBlade 微服务集合</description>

4
doc/nacos/blade.yaml
View File

@ -68,6 +68,10 @@ management:
#blade配置
blade:
xss:
url:
exclude-patterns:
- /weixin
secure:
url:
exclude-patterns:

9
doc/sql/blade-update-2.3.1.sql Normal file
View File

@ -0,0 +1,9 @@
ALTER TABLE `blade_log_error`
ADD COLUMN `remote_ip` varchar(255) NULL COMMENT '操作IP地址' AFTER `line_number`,
ADD COLUMN `time` varchar(64) NULL COMMENT '执行时间' AFTER `params`;
ALTER TABLE `blade_log_usual`
ADD COLUMN `remote_ip` varchar(255) NULL COMMENT '操作IP地址' AFTER `request_uri`,
ADD COLUMN `method_class` varchar(255) NULL COMMENT '方法类' AFTER `remote_ip`,
ADD COLUMN `method_name` varchar(255) NULL COMMENT '方法名' AFTER `method_class`,
ADD COLUMN `time` datetime(0) NULL COMMENT '执行时间' AFTER `params`;

BIN
pic/springblade-framework.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 214 KiB

After

Width:  |  Height:  |  Size: 161 KiB

8
pom.xml
View File

@ -5,12 +5,12 @@
<groupId>org.springblade</groupId>
<artifactId>SpringBlade</artifactId>
<version>2.3.0</version>
<version>2.3.1</version>
<packaging>pom</packaging>
<properties>
<blade.tool.version>2.3.0</blade.tool.version>
<blade.project.version>2.3.0</blade.project.version>
<blade.tool.version>2.3.1</blade.tool.version>
<blade.project.version>2.3.1</blade.project.version>
<java.version>1.8</java.version>
<swagger.version>2.9.2</swagger.version>
@ -23,7 +23,7 @@
<alibaba.cloud.version>0.9.0.RELEASE</alibaba.cloud.version>
<spring.boot.admin.version>2.1.4</spring.boot.admin.version>
<spring.boot.version>2.1.4.RELEASE</spring.boot.version>
<spring.boot.version>2.1.5.RELEASE</spring.boot.version>
<spring.cloud.version>Greenwich.SR1</spring.cloud.version>
<spring.platform.version>Cairo-SR7</spring.platform.version>