wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update - 调整工程引入的 jar, 同时修改 bootstrap.yml 默认内容, 完成相关功能开发

Browse Source
This commit is contained in:
wangli 2023-09-08 18:44:20 +08:00
parent ca3ff9212d
commit c200db3c4b
16 changed files with 98 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tyr-api/src/main/java/cn/axzo/tyr/client/feign/ProductApi.java
View File

@ -10,6 +10,7 @@ import cn.axzo.tyr.client.model.product.ProductSearchListReq;
import cn.axzo.tyr.client.model.product.ProductSearchPageReq;
import cn.axzo.tyr.client.model.product.ProductUpdateReq;
import cn.axzo.tyr.client.model.product.ProductVO;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
@ -17,7 +18,9 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
@ -54,7 +57,7 @@ public interface ProductApi {
* @return {@link ProductVO}
*/
@GetMapping("api/auth/product/get/id")
ApiResult<ProductVO> getById(Long id);
ApiResult<ProductVO> getById(@RequestParam(required = false) @NotNull(message = "id不能为空") Long id);
/**
* 新增产品基础信息
@ -81,7 +84,7 @@ public interface ProductApi {
* @return 返回被删除的产品信息
*/
@DeleteMapping("api/auth/product/delete/id")
ApiResult<ProductVO> delete(Long id);
ApiResult<ProductVO> delete(@RequestParam(required = false) @NotNull(message = "id不能为空") Long id);
/**
* 返回指定产品和单位类型下所有已有权限点集合
@ -99,5 +102,5 @@ public interface ProductApi {
* @return
*/
@PostMapping("api/auth/product/feature/relation/update")
ApiResult<Boolean> updateFeatureRelation(List<ProductFeatureRelationUpdateReq> req);
ApiResult<Boolean> updateFeatureRelation(@Validated @RequestBody List<ProductFeatureRelationUpdateReq> req);
}

6
tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasBasicDictApi.java
View File

@ -7,8 +7,10 @@ import cn.axzo.tyr.client.model.dict.request.*;
import cn.axzo.tyr.client.model.dict.response.BasicDictNodeResp;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@ -75,7 +77,9 @@ public interface SaasBasicDictApi {
* @param req
* @return
*/
@PostMapping("/update-status")
@PostMapping("api/dict//update-status")
ApiResult<Boolean> updateStatus(@RequestBody @Validated BasicDictUpdateStatusReq req);
@GetMapping("api/dict/get")
ApiResult<BasicDictNodeResp> get(@RequestParam Long id);
}

2
tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductAddReq.java
View File

@ -25,7 +25,7 @@ public class ProductAddReq {
*/
@NotBlank(message = "产品名称不能为空")
@Length(max = 35, message = "产品名称长度不能超过 35 个字符")
private String name;
private String productName;
/**
* 产品图标

2
tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductUpdateReq.java
View File

@ -28,7 +28,7 @@ public class ProductUpdateReq {
/**
* 产品名称
*/
private String name;
private String productName;
/**
* 产品图标

3
tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductVO.java
View File

@ -26,7 +26,7 @@ public class ProductVO {
/**
* 产品名称
*/
private String name;
private String productName;
/**
* 产品图标
@ -57,4 +57,5 @@ public class ProductVO {
* 更新时间
*/
private Date updateAt;
}

8
tyr-server/pom.xml
View File

@ -54,15 +54,15 @@
<artifactId>mysql-connector-java</artifactId>
</dependency>
<!--mybatis-plus-->
<dependency>
<!--<dependency>
<groupId>cn.axzo.framework</groupId>
<artifactId>axzo-mybatisplus-spring-boot-starter</artifactId>
</dependency>
</dependency>-->
<!-- druid -->
<dependency>
<!--<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
</dependency>
</dependency>-->
<dependency>
<groupId>cn.axzo.framework</groupId>

4
tyr-server/src/main/java/cn/axzo/tyr/server/config/filter/HttpTraceLogFilter.java
View File

@ -39,7 +39,7 @@ import java.util.*;
* @Description: Http接口日志记录
*/
@Slf4j
@Component
//@Component
public class HttpTraceLogFilter extends OncePerRequestFilter implements Ordered {
private static final String X_REQUEST_ID = "x-request-id";
@ -256,4 +256,4 @@ public class HttpTraceLogFilter extends OncePerRequestFilter implements Ordered
}
}
}
}
}

5
tyr-server/src/main/java/cn/axzo/tyr/server/controller/dict/SaasBasicDictController.java
View File

@ -55,4 +55,9 @@ public class SaasBasicDictController implements SaasBasicDictApi {
public ApiResult<Boolean> updateStatus(BasicDictUpdateStatusReq req) {
return null;
}
@Override
public ApiResult<BasicDictNodeResp> get(Long id) {
return saasBasicDictService.getById(id);
}
}

1
tyr-server/src/main/java/cn/axzo/tyr/server/controller/product/ProductController.java
View File

@ -16,6 +16,7 @@ import cn.axzo.tyr.server.service.ProductService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;

4
tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasBasicDict.java
View File

@ -1,6 +1,6 @@
package cn.axzo.tyr.server.repository.entity;
import cn.axzo.framework.data.mybatisplus.model.BaseEntity;
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
@ -91,7 +91,7 @@ public class SaasBasicDict extends BaseEntity<SaasBasicDict> implements Serializ
/**
* 扩展信息
*/
@TableField(value = "ex", typeHandler = JacksonTypeHandler.class)
@TableField(value = "ext", typeHandler = JacksonTypeHandler.class)
private Map<String, String> ext;
}

6
tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasFeature.java
View File

@ -1,6 +1,6 @@
package cn.axzo.tyr.server.repository.entity;
import cn.axzo.framework.data.mybatisplus.model.BaseEntity;
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;
import lombok.Builder;
@ -11,7 +11,7 @@ import java.io.Serializable;
/**
* <p>
*
*
* </p>
*
* @author ZhanSiHu
@ -88,7 +88,7 @@ public class SaasFeature extends BaseEntity<SaasFeature> implements Serializable
private Integer sort;
/**
* 菜单适用于平台 0:企业工作台 1:项目工作台
* 菜单适用于平台 0:企业工作台 1:项目工作台
*/
private String terminal;

3
tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/ProductModuleDao.java
View File

@ -4,6 +4,7 @@ import cn.axzo.tyr.server.repository.entity.ProductModule;
import cn.axzo.tyr.server.repository.mapper.ProductModuleMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Repository;
import org.springframework.stereotype.Service;
/**
* saas-产品表(SaasProduct)表服务实现类
@ -11,7 +12,7 @@ import org.springframework.stereotype.Repository;
* @author makejava
* @since 2022-05-24 11:15:04
*/
@Repository
@Service
public class ProductModuleDao extends ServiceImpl<ProductModuleMapper, ProductModule> {
}

4
tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasBasicDictService.java
View File

@ -6,6 +6,9 @@ import cn.axzo.tyr.client.model.dict.response.BasicDictNodeResp;
import java.util.List;
import cn.axzo.framework.domain.web.result.ApiResult;
import cn.axzo.tyr.client.model.dict.response.BasicDictNodeResp;
/**
* @author： chenwenjian
* @date： 2023/9/7 17:54
@ -15,4 +18,5 @@ import java.util.List;
*/
public interface SaasBasicDictService {
ApiResult<List<BasicDictNodeResp>> getBasicDictNodeList(BasicDictQueryReq req);
ApiResult<BasicDictNodeResp> getById(Long id);
}

3
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java
View File

@ -16,7 +16,6 @@ import cn.axzo.tyr.server.service.ProductService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.beanutils.BeanMap;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@ -74,7 +73,7 @@ public class ProductServiceImpl implements ProductService {
ProductModule productModule = productModuleDao.getById(req.getId());
BeanMapper.copyBeanIgnoreNull(req, ()-> productModule);
productModuleDao.updateById(productModule);
return ApiResult.ok();
return ApiResult.ok(BeanMapper.copyBeanIgnoreNull(productModule, ProductVO.class));
}
@Override

5
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasBasicDictServiceImpl.java
View File

@ -1,5 +1,6 @@
package cn.axzo.tyr.server.service.impl;
import cn.axzo.basics.common.BeanMapper;
import cn.axzo.framework.domain.web.result.ApiResult;
import cn.axzo.tyr.client.model.dict.request.BasicDictQueryReq;
import cn.axzo.tyr.client.model.dict.response.BasicDictNodeResp;
@ -30,4 +31,8 @@ public class SaasBasicDictServiceImpl implements SaasBasicDictService {
return null;
}
@Override
public ApiResult<BasicDictNodeResp> getById(Long id) {
return ApiResult.ok(BeanMapper.copyBean(saasBasicDictDao.getById(id), BasicDictNodeResp.class));
}
}

57
tyr-server/src/main/resources/bootstrap.yml
View File

@ -4,10 +4,9 @@ spring:
cloud:
nacos:
config:
server-addr: ${NACOS_HOST:dev-nacos.axzo.cn}:${NACOS_PORT:80}
server-addr: ${NACOS_HOST}:${NACOS_PORT}
file-extension: yaml
namespace: ${NACOS_NAMESPACE_ID:35eada10-9574-4db8-9fea-bc6a4960b6c7}
prefix: ${spring.application.name}
namespace: ${NACOS_NAMESPACE_ID}
profiles:
active: ${NACOS_PROFILES_ACTIVE:local}
include: swagger
@ -35,3 +34,55 @@ management:
knife4j:
enable: true
---
#本地开发机器连接公网中间件地址(仅 DEV 环境)
spring:
config:
activate:
on-profile: local
cloud:
nacos:
config:
server-addr: ${NACOS_HOST:dev-nacos.axzo.cn}:${NACOS_PORT:80}
file-extension: yaml
namespace: ${NACOS_NAMESPACE_ID:f82179f1-81a9-41a1-a489-4f9ab5660a6e}
logging:
level:
root: debug
---
#开发环境
spring:
config:
activate:
on-profile: dev
cloud:
nacos:
config:
server-addr: ${NACOS_HOST:dev-nacos.axzo.cn}:${NACOS_PORT:80}
file-extension: yaml
namespace: ${NACOS_NAMESPACE_ID:35eada10-9574-4db8-9fea-bc6a4960b6c7}
---
#测试环境
spring:
config:
activate:
on-profile: test
cloud:
nacos:
config:
server-addr: ${NACOS_HOST:test-nacos.axzo.cn}:${NACOS_PORT:80}
file-extension: yaml
namespace: ${NACOS_NAMESPACE_ID:f3c0f0d2-bac4-4498-bee7-9c3636b3afdf}
---
#预发布环境
spring:
config:
activate:
on-profile: pre
cloud:
nacos:
config:
server-addr: ${NACOS_HOST:https://pre-nacos.axzo.cn}:${NACOS_PORT:443}
file-extension: yaml
namespace: ${NACOS_NAMESPACE_ID:8b4cf725-7595-4c92-b2a6-9260a51ce078}