yun-zuoyi
alwaysfrin 6 years ago
commit c6f8e367f7

@ -79,6 +79,7 @@ public class SysDictionaryController extends CoreBaseController{
// 条件验证
ValidatorBean.beginValid(sysDictionary)
.notNull("id",sysDictionary.getId())
.notNull("name",sysDictionary.getName())
.notNull("dictionarySoftType",sysDictionary.getDictionarySoftType())
.notNull("dictionaryCode",sysDictionary.getDictionaryCode())
@ -311,9 +312,9 @@ public class SysDictionaryController extends CoreBaseController{
}
}
@GetMapping("/find-soft-type")
@GetMapping("/find-soft-type/{id}")
@ApiOperation(value = "根据模块查询顶级字典",notes = "根据模块查询顶级字典")
public ResultBean findSysDictionaryByTopBySoftType(Integer softType){
public ResultBean findSysDictionaryByTopBySoftType(@PathVariable("id")Integer softType){
try {
List<SysDictionary> dictionaryList = sysDictionaryService.findSysDictionaryByTopBySoftType(softType);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(dictionaryList);

@ -56,7 +56,7 @@ public class SysMessageController extends CoreBaseController {
@PostMapping(value = "/sys-message/insert")
@ApiOperation(value = "新增消息",notes = "新增消息")
public ResultBean<SysMessage> insertSysMessage(@RequestBody SysMessage sysMessage){
public ResultBean<SysMessage> insertSysMessage(SysMessage sysMessage){
try {
// 条件校验
ValidatorBean.beginValid(sysMessage)
@ -163,7 +163,7 @@ public class SysMessageController extends CoreBaseController {
}
}
@GetMapping(value = "/sys-message/query")
@PostMapping(value = "/sys-message/query")
@ApiOperation(value = "消息复杂查询,分页,排序",notes = "消息复杂查询,分页,排序")
public ResultBean<SysMessage> querySysMessageByPager(@RequestBody MessagePagerModel messagePagerModel){
try {
@ -343,7 +343,12 @@ public class SysMessageController extends CoreBaseController {
}
}
@GetMapping(value = "/user-message/query")
/**
*
* @param refUserMessagePagerModel
* @return
*/
@PostMapping(value = "/user-message/query")
@ApiOperation(value = "消息复杂查询,分页,排序",notes = "消息复杂查询,分页,排序")
public ResultBean<SysRefUserMessage> querySysRefUserMessageByPager(@RequestBody RefUserMessagePagerModel refUserMessagePagerModel){
try {

@ -362,7 +362,7 @@ public class SysOrderNoRuleController extends CoreBaseController {
@GetMapping(value = "/get-order-no/{code}")
@ApiOperation(value = "根据单号规则代码,生成单号")
public ResultBean getOrderNo(@PathVariable("code") String code) {
public synchronized ResultBean getOrderNo(@PathVariable("code") String code) {
try {
ValidatorBean.checkNotNull(code, "code不能为空");

@ -96,14 +96,14 @@ public class SysOrderNoRuleService implements ISysOrderNoRuleService {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
.setErrorDetail("规则代码不存在存在")
.setErrorDetail("[" + code + "]规则代码不存在存在")
.setErrorSolution("请重新输入规则代码")
.build();
}else if(sysOrderNoRule.getOrderNoRuleStatus() == CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("单号规则已禁用")
.setErrorDetail("[" + code + "]单号规则已禁用")
.setErrorSolution("请重新输入规则代码")
.build();
}else {

@ -0,0 +1,184 @@
#项目端口
server.port=8100
#本机ip
impp.server.ip=imppcore
#console控制台服务zipkin追踪全路径
impp.console.ip=http://console:8010
################ 功能配置1 ################
#若无法连接注册中心,是否需要一直检测加入
impp.cluster.fetch=true
#服务注册中心
impp.cluster.regist.center=http://register:8000/eureka/
#多注册中心
#impp.cluster.regist.center=http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/
################ 功能配置2 ################
#是否允许前端跨域提交impp.web.cross.hosts
impp.web.cross = true
################ 授权过滤配置 ################
#用户登陆路径
filter.shiro.user.loginuri = /login
#系统管理员登陆路径
filter.shiro.admin.loginuri = /salogin
#运维人员登陆路径
filter.shiro.saadmin.loginuri = /salogin
#用户授权过滤路径
filter.shiro.user.filteruri = /impp/operate/**
#用户授权过滤路径
filter.shiro.admin.filteruri = /impp/adoperate/*
#用户授权过滤路径
filter.shiro.saadmin.filteruri = /impp/saoperate/*
################ 云配置 以projectName作为应用名 ################
#是否开启微服
eureka.client.enabled=true
#(参数配置)注册中心地址 -》 i3plus-ics多个用逗号分隔
eureka.client.service-url.defaultZone=${impp.cluster.regist.center}
#区域源码中包含defaultZone所以默认使用defaultZone
#eureka.client.region=estsh
#eureka.client.service-url.estsh:http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/
################ 本机微服配置 ################
#本服务主机ip若多个网卡则需要设置本服务ip
eureka.instance.ip-address=${impp.server.ip}
#本服务实例ID
eureka.instance.instance-id=${impp.server.ip}:${server.port}
#本服务主机名
eureka.instance.hostname=${impp.server.ip}
#本服务状态页面
eureka.instance.status-page-url=http://${impp.server.ip}:${server.port}/swagger-ui.html
#将自己的IP注册到Eureka Server。若不配置或设置为false表示注册微服务所在操作系统的hostname到Eureka Server
eureka.instance.prefer-ip-address=true
#是否进行健康检查
eureka.client.healthcheck.enabled=true
################ 检测机制 ################
#心跳间隔周期宕机限制30秒没反应视为宕机
eureka.instance.lease-expiration-duration-in-seconds=30
#心跳周期
eureka.instance.lease-renewal-interval-in-seconds=20
#打开feign的熔断
feign.hystrix.enabled=true
#重试
ribbon.maxAutoRetries=2
#读取数据时长
ribbon.ReadTimeout=10000
#连接时长
ribbon.ConnectTimeout=10000
#响应超过时长,进行熔断(熔断超时需要大于读取时长及连接时长)
hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=15000
#集群名
eureka.instance.metadata-map.cluster=impp_cluster
################ 链路追踪 ################
#使用web方式传输信息
spring.zipkin.sender.type=web
#链路追踪服务的地址
spring.zipkin.base-url=${impp.console.ip}
#追踪深度百分比1是全部
spring.sleuth.sampler.probability=1.0
################ 日志据源 ################
spring.data.mongodb.database=mongoDBSource
spring.data.mongodb.uri=mongodb:27017
spring.data.mongodb.username=sa
spring.data.mongodb.password=i3plus
spring.data.mongodb.port=27017
################ 主数据源 ################
# mysql
#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
#spring.datasource.url=jdbc:mysql://localhost:3306/i3wms
##Sql-server##
#spring.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
#spring.datasource.url=jdbc:sqlserver://127.0.0.1:1433;databaseName=i3wms
##oracle##
#spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
#spring.datasource.url=jdbc:oracle:thin:@127.0.0.1:1521:i3wms
#spring.datasource.username=root
#spring.datasource.password=123456
##主数据源,读写
#impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource
impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver
impp.write.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.write.datasource.username=root
impp.write.datasource.password=estsh123
##辅数据源,只读
#impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource
impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver
impp.read.datasource.jdbc-url=jdbc:mysql://dbslave:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.read.datasource.username=root
impp.read.datasource.password=estsh123
##############定时任务持久化##############
impp.schedule.open=true
impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver
impp.schedule.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.schedule.datasource.username=root
impp.schedule.datasource.password=estsh123
impp.schedule.datasource.max-connections=20
#定时任务在服务启动后多少秒执行
impp.schedule.start.after-second=20
#是否集群部署
impp.schedule.datasource.is-clustered=true
#执行检测(毫秒),若宕机由其他定时器执行
impp.schedule.datasource.cluster-checkin-interval=30000
#线程数
impp.schedule.thread-count=10
#线程优先级1-10默认为5
impp.schedule.thread-priority=5
################ 数据池设置 ################
spring.datasource.maximum-pool-size=10
spring.datasource.max-active=3
spring.datasource.max-idle=3
spring.datasource.min-idle=1
spring.datasource.initial-size=1
spring.datasource.max-wait=10000
spring.datasource.validation-query=SELECT 1
spring.datasource.test-on-borrow=false
spring.datasource.test-while-idle=true
spring.datasource.time-between-eviction-runs-millis=18800
################ JPA设置设置 ################
# mysql
spring.jpa.database=MYSQL
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
##Sql-server##
#spring.jpa.database=sql_server
#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.SQLServerDialect
##oracle##
#spring.jpa.database=oracle
#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
# mysql
spring.datasource.validationQuery=SELECT 1
##Sql-server##
# spring.datasource.validationQuery=SELECT 1
##oracle##
# spring.datasource.validationQuery=SELECT 1 FROM DUAL
#ImprovedNamingStrategy / physical_naming_strategy java属性映射到数据库字段时命名规则
# spring.jpa.properties.hibernate.physical_naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy/org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
#表关系create,create-drop,update,validate
spring.jpa.properties.hibernate.hbm2ddl.auto=update
#是否显示sql
spring.jpa.show-sql=true
################ MQ队列处理 ################
# 站内信
impp.mq.queue.letter = true
# 邮件
impp.mq.queue.mail = true
# 定时任务
impp.mq.queue.schedule = true
# SWEB通知处理队列
impp.mq.queue.sweb.notice = true
Loading…
Cancel
Save