配置改动+多客户示例
This commit is contained in:
parent
ff5db6cbc5
commit
040e07e6d8
|
|
@ -8,32 +8,25 @@ rm -rf *.jar
|
|||
echo "workspace is ${WORKSPACE}"
|
||||
mv ${WORKSPACE}/sgzb-auth/target/sgzb-auth.jar $deploy_path
|
||||
mv ${WORKSPACE}/sgzb-gateway/target/sgzb-gateway.jar $deploy_path
|
||||
mv ${WORKSPACE}/sgzb-modules/sgzb-system/target/sgzb-modules-system.jar $deploy_path
|
||||
mv ${WORKSPACE}/sgzb-modules/sgzb-base/target/sgzb-modules-base.jar $deploy_path
|
||||
mv ${WORKSPACE}/sgzb-modules/sgzb-file/target/sgzb-modules-file.jar $deploy_path
|
||||
mv ${WORKSPACE}/sgzb-modules/sgzb-material/target/sgzb-modules-material.jar $deploy_path
|
||||
mv ${WORKSPACE}/sgzb-modules/sgzb-system/target/sgzb-modules-system.jar $deploy_path
|
||||
chmod 777 *.jar
|
||||
echo "--------moveFile end--------------"
|
||||
export sgzb_auth_enable=true
|
||||
export sgzb_gateway_enable=true
|
||||
export sgzb_modules_system_enable=true
|
||||
export sgzb_modules_base_enable=false
|
||||
export sgzb_modules_file_enable=false
|
||||
export sgzb_modules_material_enable=true
|
||||
export sgzb_modules_system_enable=true
|
||||
|
||||
export sgzb_auth_jar=sgzb-auth.jar
|
||||
export sgzb_gateway_jar=sgzb-gateway.jar
|
||||
export sgzb_modules_system_jar=sgzb-modules-system.jar
|
||||
export sgzb_modules_base_jar=sgzb-modules-base.jar
|
||||
export sgzb_modules_file_jar=sgzb-modules-file.jar
|
||||
export sgzb_modules_material_jar=sgzb-modules-material.jar
|
||||
export sgzb_auth_jar=sgzb-auth-1.0.jar
|
||||
export sgzb_gateway_jar=sgzb-gateway-1.0.jar
|
||||
export sgzb_modules_material_jar=sgzb-modules-material-1.0.jar
|
||||
export sgzb_modules_system_jar=sgzb-modules-system-1.0.jar
|
||||
|
||||
export sgzb_auth_port=39200
|
||||
export sgzb_gateway_port=39080
|
||||
export sgzb_modules_system_port=39201
|
||||
export sgzb_modules_base_port=39301
|
||||
export sgzb_modules_file_port=39300
|
||||
export sgzb_modules_material_port=39302
|
||||
export sgzb_modules_system_port=39201
|
||||
|
||||
|
||||
if($auth_service_enable);then
|
||||
echo "--------auth开始启动--------------"
|
||||
|
|
@ -81,69 +74,6 @@ if($sgzb_gateway_enable);then
|
|||
fi
|
||||
|
||||
|
||||
if($sgzb_modules_system_enable);then
|
||||
echo "--------sgzb_modules_system 开始启动--------------"
|
||||
echo "--------删除sgzb_modules_system开始--------------"
|
||||
P_ID=`ps -ef | grep -w $sgzb_modules_system_jar | grep -v "grep" | awk '{print $2}'`
|
||||
if [ "$P_ID" == "" ]; then
|
||||
echo "===sgzb_modules_system process not exists or stop success"
|
||||
else
|
||||
kill -9 $P_ID
|
||||
echo "sgzb_modules_system killed success"
|
||||
fi
|
||||
echo "--------sgzb_modules_system开始部署--------------"
|
||||
nohup /usr/lib/jvm/jdk1.8.0_381/bin/java -jar $sgzb_modules_system_jar >/dev/null 2>&1 &
|
||||
sgzb_modules_system_pid=`lsof -i:$sgzb_modules_system_port|grep "LISTEN"|awk '{print $2}'`
|
||||
until [ -n "$sgzb_modules_system_pid" ]
|
||||
do
|
||||
sgzb_modules_system_pid=`lsof -i:$sgzb_modules_system_port|grep "LISTEN"|awk '{print $2}'`
|
||||
done
|
||||
echo "sgzb_modules_system pid is $sgzb_modules_system_pid"
|
||||
echo "--------sgzb_modules_system 启动成功--------------"
|
||||
fi
|
||||
|
||||
if($sgzb_modules_base_enable);then
|
||||
echo "--------sgzb_modules_base 开始启动--------------"
|
||||
echo "--------删除sgzb_modules_base开始--------------"
|
||||
P_ID=`ps -ef | grep -w $sgzb_modules_base_jar | grep -v "grep" | awk '{print $2}'`
|
||||
if [ "$P_ID" == "" ]; then
|
||||
echo "===sgzb_modules_base process not exists or stop success"
|
||||
else
|
||||
kill -9 $P_ID
|
||||
echo "sgzb_modules_base killed success"
|
||||
fi
|
||||
echo "--------sgzb_modules_base开始部署--------------"
|
||||
nohup /usr/lib/jvm/jdk1.8.0_381/bin/java -jar $sgzb_modules_base_jar >/dev/null 2>&1 &
|
||||
sgzb_modules_base_pid=`lsof -i:$sgzb_modules_base_port|grep "LISTEN"|awk '{print $2}'`
|
||||
until [ -n "$sgzb_modules_base_pid" ]
|
||||
do
|
||||
sgzb_modules_base_pid=`lsof -i:$sgzb_modules_base_port|grep "LISTEN"|awk '{print $2}'`
|
||||
done
|
||||
echo "sgzb_modules_base pid is $sgzb_modules_base_pid"
|
||||
echo "--------sgzb_modules_base 启动成功--------------"
|
||||
fi
|
||||
|
||||
if($sgzb_modules_file_enable);then
|
||||
echo "--------sgzb_modules_file 开始启动--------------"
|
||||
echo "--------删除sgzb_modules_file开始--------------"
|
||||
P_ID=`ps -ef | grep -w $sgzb_modules_file_jar | grep -v "grep" | awk '{print $2}'`
|
||||
if [ "$P_ID" == "" ]; then
|
||||
echo "===sgzb_modules_file process not exists or stop success"
|
||||
else
|
||||
kill -9 $P_ID
|
||||
echo "sgzb_modules_file killed success"
|
||||
fi
|
||||
echo "--------sgzb_modules_file开始部署--------------"
|
||||
nohup /usr/lib/jvm/jdk1.8.0_381/bin/java -jar $sgzb_modules_file_jar >/dev/null 2>&1 &
|
||||
sgzb_modules_file_pid=`lsof -i:$sgzb_modules_file_port|grep "LISTEN"|awk '{print $2}'`
|
||||
until [ -n "$sgzb_modules_file_pid" ]
|
||||
do
|
||||
sgzb_modules_file_pid=`lsof -i:$sgzb_modules_file_port|grep "LISTEN"|awk '{print $2}'`
|
||||
done
|
||||
echo "sgzb_modules_file pid is $sgzb_modules_file_pid"
|
||||
echo "--------sgzb_modules_file 启动成功--------------"
|
||||
fi
|
||||
|
||||
if($sgzb_modules_material_enable);then
|
||||
echo "--------sgzb_modules_material 开始启动--------------"
|
||||
echo "--------删除sgzb_modules_material开始--------------"
|
||||
|
|
@ -163,4 +93,26 @@ if($sgzb_modules_material_enable);then
|
|||
done
|
||||
echo "sgzb_modules_material pid is $sgzb_modules_material_pid"
|
||||
echo "--------sgzb_modules_material 启动成功--------------"
|
||||
fi
|
||||
|
||||
|
||||
if($sgzb_modules_system_enable);then
|
||||
echo "--------sgzb_modules_system 开始启动--------------"
|
||||
echo "--------删除sgzb_modules_system开始--------------"
|
||||
P_ID=`ps -ef | grep -w $sgzb_modules_system_jar | grep -v "grep" | awk '{print $2}'`
|
||||
if [ "$P_ID" == "" ]; then
|
||||
echo "===sgzb_modules_system process not exists or stop success"
|
||||
else
|
||||
kill -9 $P_ID
|
||||
echo "sgzb_modules_system killed success"
|
||||
fi
|
||||
echo "--------sgzb_modules_system开始部署--------------"
|
||||
nohup /usr/lib/jvm/jdk1.8.0_381/bin/java -jar $sgzb_modules_system_jar >/dev/null 2>&1 &
|
||||
sgzb_modules_system_pid=`lsof -i:$sgzb_modules_system_port|grep "LISTEN"|awk '{print $2}'`
|
||||
until [ -n "$sgzb_modules_system_pid" ]
|
||||
do
|
||||
sgzb_modules_system_pid=`lsof -i:$sgzb_modules_system_port|grep "LISTEN"|awk '{print $2}'`
|
||||
done
|
||||
echo "sgzb_modules_system pid is $sgzb_modules_system_pid"
|
||||
echo "--------sgzb_modules_system 启动成功--------------"
|
||||
fi
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>sgzb-auth</artifactId>
|
||||
<artifactId>sgzb-auth-1.0</artifactId>
|
||||
|
||||
<description>
|
||||
sgzb-auth认证授权中心
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
# Spring
|
||||
spring:
|
||||
cloud:
|
||||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
|
||||
onlineApprove: /lbcloud-oauth/oauth/token
|
||||
wechatAppId: crhmaxnE
|
||||
wechatAppsecret: 3893e6ed90d325f00e34583dd970a56580c05549
|
||||
getNowPersonDetailData: /lbcloud-user/user/queryLoginUserInfo
|
||||
baseUrl: https://test-sso.csgmall.com.cn
|
||||
appAppsecret: d8e6db9fa9bb09da0e270fa739233c823bf9c5f0
|
||||
personEasyList: /lbcloud-user/api/user/queryAndPaging/basicInfo
|
||||
h5Appsecret: 3c4a67b7f6a268b4202a5328e6a1726979d5903b
|
||||
h5AppId: G3NksDH2
|
||||
appsecret: 596e4863c8d112842ce820c130b236001297ea73
|
||||
appId: akvVFYgy
|
||||
appAppId: u8LLfynf
|
||||
getPersonDetailData: /lbcloud-user/api/user/queryById
|
||||
registerPhone: /lbcloud-user/api/user/registrationByPhone
|
||||
userBindUrl: /lbcloud-authority/api/RoleClient/bindDefaultSystemRole
|
||||
verifyPhoneCode: /lbcloud-mbroker/api/broker/simpleVerificationCode
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
# Spring
|
||||
spring:
|
||||
cloud:
|
||||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
|
||||
onlineApprove: /lbcloud-oauth/oauth/token
|
||||
wechatAppId: crhmaxnE
|
||||
wechatAppsecret: 3893e6ed90d325f00e34583dd970a56580c05549
|
||||
getNowPersonDetailData: /lbcloud-user/user/queryLoginUserInfo
|
||||
baseUrl: https://test-sso.csgmall.com.cn
|
||||
appAppsecret: d8e6db9fa9bb09da0e270fa739233c823bf9c5f0
|
||||
personEasyList: /lbcloud-user/api/user/queryAndPaging/basicInfo
|
||||
h5Appsecret: 3c4a67b7f6a268b4202a5328e6a1726979d5903b
|
||||
h5AppId: G3NksDH2
|
||||
appsecret: 596e4863c8d112842ce820c130b236001297ea73
|
||||
appId: akvVFYgy
|
||||
appAppId: u8LLfynf
|
||||
getPersonDetailData: /lbcloud-user/api/user/queryById
|
||||
registerPhone: /lbcloud-user/api/user/registrationByPhone
|
||||
userBindUrl: /lbcloud-authority/api/RoleClient/bindDefaultSystemRole
|
||||
verifyPhoneCode: /lbcloud-mbroker/api/broker/simpleVerificationCode
|
||||
|
|
@ -10,35 +10,3 @@ spring:
|
|||
profiles:
|
||||
# 环境配置
|
||||
active: sgzb_cloud_dev
|
||||
cloud:
|
||||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 192.168.0.14:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 192.168.0.14:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
|
||||
onlineApprove: /lbcloud-oauth/oauth/token
|
||||
wechatAppId: crhmaxnE
|
||||
wechatAppsecret: 3893e6ed90d325f00e34583dd970a56580c05549
|
||||
getNowPersonDetailData: /lbcloud-user/user/queryLoginUserInfo
|
||||
baseUrl: https://test-sso.csgmall.com.cn
|
||||
appAppsecret: d8e6db9fa9bb09da0e270fa739233c823bf9c5f0
|
||||
personEasyList: /lbcloud-user/api/user/queryAndPaging/basicInfo
|
||||
h5Appsecret: 3c4a67b7f6a268b4202a5328e6a1726979d5903b
|
||||
h5AppId: G3NksDH2
|
||||
appsecret: 596e4863c8d112842ce820c130b236001297ea73
|
||||
appId: akvVFYgy
|
||||
appAppId: u8LLfynf
|
||||
getPersonDetailData: /lbcloud-user/api/user/queryById
|
||||
registerPhone: /lbcloud-user/api/user/registrationByPhone
|
||||
userBindUrl: /lbcloud-authority/api/RoleClient/bindDefaultSystemRole
|
||||
verifyPhoneCode: /lbcloud-mbroker/api/broker/simpleVerificationCode
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>sgzb-gateway</artifactId>
|
||||
<artifactId>sgzb-gateway-1.0</artifactId>
|
||||
|
||||
<description>
|
||||
sgzb-gateway网关模块
|
||||
|
|
|
|||
|
|
@ -0,0 +1,50 @@
|
|||
# Spring Boot Actuator V2中风险漏洞处理,禁止远程端口访问
|
||||
management:
|
||||
endpoint:
|
||||
env:
|
||||
enabled: false
|
||||
|
||||
# Spring
|
||||
spring:
|
||||
cloud:
|
||||
loadbalancer:
|
||||
# 关闭Ribbon的负载均衡器
|
||||
ribbon:
|
||||
enabled: false
|
||||
# 开启Nacos的负载均衡器
|
||||
nacos:
|
||||
enabled: true
|
||||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
sentinel:
|
||||
# 取消控制台懒加载
|
||||
eager: true
|
||||
transport:
|
||||
# 控制台地址
|
||||
dashboard: 127.0.0.1:8718
|
||||
# nacos配置持久化
|
||||
datasource:
|
||||
ds1:
|
||||
nacos:
|
||||
server-addr: 127.0.0.1:8848
|
||||
dataId: sentinel-sgzb-gateway
|
||||
groupId: DEFAULT_GROUP
|
||||
data-type: json
|
||||
rule-type: gw-flow
|
||||
|
||||
#加密组件
|
||||
jasypt:
|
||||
encryptor:
|
||||
password: Encrypt
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
# Spring Boot Actuator V2中风险漏洞处理,禁止远程端口访问
|
||||
management:
|
||||
endpoint:
|
||||
env:
|
||||
enabled: false
|
||||
|
||||
# Spring
|
||||
spring:
|
||||
cloud:
|
||||
loadbalancer:
|
||||
# 关闭Ribbon的负载均衡器
|
||||
ribbon:
|
||||
enabled: false
|
||||
# 开启Nacos的负载均衡器
|
||||
nacos:
|
||||
enabled: true
|
||||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
sentinel:
|
||||
# 取消控制台懒加载
|
||||
eager: true
|
||||
transport:
|
||||
# 控制台地址
|
||||
dashboard: 127.0.0.1:8718
|
||||
# nacos配置持久化
|
||||
datasource:
|
||||
ds1:
|
||||
nacos:
|
||||
server-addr: 127.0.0.1:8848
|
||||
dataId: sentinel-sgzb-gateway
|
||||
groupId: DEFAULT_GROUP
|
||||
data-type: json
|
||||
rule-type: gw-flow
|
||||
|
||||
#加密组件
|
||||
jasypt:
|
||||
encryptor:
|
||||
password: Encrypt
|
||||
|
|
@ -2,12 +2,6 @@
|
|||
server:
|
||||
port: 39080
|
||||
|
||||
# Spring Boot Actuator V2中风险漏洞处理,禁止远程端口访问
|
||||
management:
|
||||
endpoint:
|
||||
env:
|
||||
enabled: false
|
||||
|
||||
# Spring
|
||||
spring:
|
||||
application:
|
||||
|
|
@ -15,46 +9,4 @@ spring:
|
|||
name: sgzb-gateway
|
||||
profiles:
|
||||
# 环境配置
|
||||
active: sgzb_cloud_dev
|
||||
cloud:
|
||||
loadbalancer:
|
||||
# 关闭Ribbon的负载均衡器
|
||||
ribbon:
|
||||
enabled: false
|
||||
# 开启Nacos的负载均衡器
|
||||
nacos:
|
||||
enabled: true
|
||||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 192.168.0.14:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 192.168.0.14:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
sentinel:
|
||||
# 取消控制台懒加载
|
||||
eager: true
|
||||
transport:
|
||||
# 控制台地址
|
||||
dashboard: 127.0.0.1:8718
|
||||
# nacos配置持久化
|
||||
datasource:
|
||||
ds1:
|
||||
nacos:
|
||||
server-addr: 192.168.0.14:8848
|
||||
dataId: sentinel-sgzb-gateway
|
||||
groupId: DEFAULT_GROUP
|
||||
data-type: json
|
||||
rule-type: gw-flow
|
||||
|
||||
#加密组件
|
||||
jasypt:
|
||||
encryptor:
|
||||
password: Encrypt
|
||||
active: sgzb_cloud_local
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
<module>sgzb-job</module>
|
||||
<module>sgzb-file</module>
|
||||
<module>sgzb-material</module>
|
||||
<module>sgzb-settlement</module>
|
||||
</modules>
|
||||
|
||||
<artifactId>sgzb-modules</artifactId>
|
||||
|
|
|
|||
|
|
@ -36,11 +36,11 @@ spring:
|
|||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 192.168.0.14:8848
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 192.168.0.14:8848
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@ spring:
|
|||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 192.168.0.14:8848
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 192.168.0.14:8848
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@ spring:
|
|||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 192.168.0.14:8848
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 192.168.0.14:8848
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>sgzb-modules-material</artifactId>
|
||||
<artifactId>sgzb-modules-material-1.0</artifactId>
|
||||
|
||||
<description>
|
||||
sgzb-modules-material
|
||||
|
|
|
|||
|
|
@ -0,0 +1,59 @@
|
|||
package com.bonus.sgzb.material.controller;
|
||||
|
||||
import com.bonus.sgzb.common.core.web.controller.BaseController;
|
||||
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
|
||||
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
|
||||
import com.bonus.sgzb.material.domain.ToDoBean;
|
||||
import com.bonus.sgzb.material.service.ToDoService;
|
||||
import com.bonus.sgzb.material.vo.NoticeInfoVO;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @description 首页--代办事项
|
||||
* @author hay
|
||||
* @date 2024/1/15 17:16
|
||||
*/
|
||||
@Api(tags = " 代办事项")
|
||||
@RestController
|
||||
@RequestMapping("/cq/todo")
|
||||
public class ToDoController_CQ extends BaseController {
|
||||
@Autowired
|
||||
private ToDoService toDoService;
|
||||
|
||||
/**
|
||||
* 代办事项列表
|
||||
*/
|
||||
@ApiOperation(value = "代办事项列表")
|
||||
@GetMapping("/getToDoList")
|
||||
public TableDataInfo getToDoList(ToDoBean bean)
|
||||
{
|
||||
startPage();
|
||||
List<ToDoBean> list = toDoService.getToDoList(bean);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "代办事件下拉")
|
||||
@PostMapping("/getTaskType")
|
||||
public AjaxResult getTaskType(ToDoBean bean){
|
||||
return toDoService.getTaskType(bean);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 发送催办短信
|
||||
* @param noticeInfoVO
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = "催办")
|
||||
@PostMapping("/urgentProcessing")
|
||||
public AjaxResult urgentProcessing(@RequestBody NoticeInfoVO noticeInfoVO){
|
||||
return toAjax(toDoService.urgentProcessing(noticeInfoVO));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
package com.bonus.sgzb.material.controller;
|
||||
|
||||
import com.bonus.sgzb.common.core.web.controller.BaseController;
|
||||
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
|
||||
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
|
||||
import com.bonus.sgzb.material.domain.ToDoBean;
|
||||
import com.bonus.sgzb.material.service.ToDoService;
|
||||
import com.bonus.sgzb.material.vo.NoticeInfoVO;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @description 首页--代办事项
|
||||
* @author hay
|
||||
* @date 2024/1/15 17:16
|
||||
*/
|
||||
@Api(tags = " 代办事项")
|
||||
@RestController
|
||||
@RequestMapping("/gz/todo")
|
||||
public class ToDoController_GZ extends BaseController {
|
||||
@Autowired
|
||||
private ToDoService toDoService;
|
||||
|
||||
/**
|
||||
* 代办事项列表
|
||||
*/
|
||||
@ApiOperation(value = "代办事项列表")
|
||||
@GetMapping("/getToDoList")
|
||||
public TableDataInfo getToDoList(ToDoBean bean)
|
||||
{
|
||||
startPage();
|
||||
List<ToDoBean> list = toDoService.getToDoList(bean);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "代办事件下拉")
|
||||
@PostMapping("/getTaskType")
|
||||
public AjaxResult getTaskType(ToDoBean bean){
|
||||
return toDoService.getTaskType(bean);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 发送催办短信
|
||||
* @param noticeInfoVO
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = "催办")
|
||||
@PostMapping("/urgentProcessing")
|
||||
public AjaxResult urgentProcessing(@RequestBody NoticeInfoVO noticeInfoVO){
|
||||
return toAjax(toDoService.urgentProcessing(noticeInfoVO));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
package com.bonus.sgzb.material.mapper;
|
||||
|
||||
import com.bonus.sgzb.material.domain.ToDoBean;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Author 阮世耀
|
||||
* @Create 2023/12/13 15:45
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Mapper
|
||||
public interface ToDoMapper_CQ {
|
||||
|
||||
/**
|
||||
* 获取TaskType
|
||||
* @param bean
|
||||
* @return ToDoBean
|
||||
*/
|
||||
List<ToDoBean> getTaskType(ToDoBean bean);
|
||||
}
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
package com.bonus.sgzb.material.mapper;
|
||||
|
||||
import com.bonus.sgzb.material.domain.ToDoBean;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Author 阮世耀
|
||||
* @Create 2023/12/13 15:45
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Mapper
|
||||
public interface ToDoMapper_GZ {
|
||||
|
||||
/**
|
||||
* 获取TaskType
|
||||
* @param bean
|
||||
* @return ToDoBean
|
||||
*/
|
||||
List<ToDoBean> getTaskType(ToDoBean bean);
|
||||
}
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
package com.bonus.sgzb.material.service.impl;
|
||||
|
||||
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
|
||||
import com.bonus.sgzb.material.domain.ToDoBean;
|
||||
import com.bonus.sgzb.material.mapper.PurchaseCheckInfoMapper;
|
||||
import com.bonus.sgzb.material.mapper.ToDoMapper;
|
||||
import com.bonus.sgzb.material.mapper.ToDoMapper_CQ;
|
||||
import com.bonus.sgzb.material.mapper.ToDoMapper_GZ;
|
||||
import com.bonus.sgzb.material.service.ToDoService;
|
||||
import com.bonus.sgzb.system.api.RemoteUserService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
@Slf4j
|
||||
public class ToDoServiceImpl_CQ extends ToDoServiceImpl implements ToDoService {
|
||||
@Resource
|
||||
private ToDoMapper_CQ toDoMapper_cq;
|
||||
|
||||
@Override
|
||||
public AjaxResult getTaskType(ToDoBean bean) {
|
||||
List<ToDoBean> list =new ArrayList<>();
|
||||
try {
|
||||
list = toDoMapper_cq.getTaskType(bean);
|
||||
} catch (Exception e) {
|
||||
log.error("重庆机具-代办事件-查询失败", e);
|
||||
}
|
||||
return AjaxResult.success(list);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
package com.bonus.sgzb.material.service.impl;
|
||||
|
||||
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
|
||||
import com.bonus.sgzb.material.domain.ToDoBean;
|
||||
import com.bonus.sgzb.material.mapper.PurchaseCheckInfoMapper;
|
||||
import com.bonus.sgzb.material.mapper.ToDoMapper;
|
||||
import com.bonus.sgzb.material.mapper.ToDoMapper_CQ;
|
||||
import com.bonus.sgzb.material.mapper.ToDoMapper_GZ;
|
||||
import com.bonus.sgzb.material.service.ToDoService;
|
||||
import com.bonus.sgzb.system.api.RemoteUserService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import javax.annotation.Resource;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
@Slf4j
|
||||
public class ToDoServiceImpl_GZ extends ToDoServiceImpl implements ToDoService {
|
||||
|
||||
@Resource
|
||||
private ToDoMapper toDoMapper;
|
||||
@Resource
|
||||
private ToDoMapper_GZ toDoMapper_gz;
|
||||
|
||||
|
||||
@Resource
|
||||
private PurchaseCheckInfoMapper purchaseCheckInfoMapper;
|
||||
|
||||
@Resource
|
||||
private RemoteUserService remoteUserService;
|
||||
|
||||
@Override
|
||||
public AjaxResult getTaskType(ToDoBean bean) {
|
||||
List<ToDoBean> list =new ArrayList<>();
|
||||
try {
|
||||
list = toDoMapper_gz.getTaskType(bean);
|
||||
} catch (Exception e) {
|
||||
log.error("南网仓储-代办事件-查询失败", e);
|
||||
}
|
||||
return AjaxResult.success(list);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,27 +1,24 @@
|
|||
# Tomcat
|
||||
server:
|
||||
port: 9304
|
||||
|
||||
# Spring
|
||||
spring:
|
||||
application:
|
||||
# 应用名称
|
||||
name: sgzb-settlement
|
||||
profiles:
|
||||
# 环境配置
|
||||
active: sgzb_cloud_dev
|
||||
spring:
|
||||
cloud:
|
||||
loadbalancer:
|
||||
# 关闭Ribbon的负载均衡器
|
||||
ribbon:
|
||||
enabled: false
|
||||
# 开启Nacos的负载均衡器
|
||||
nacos:
|
||||
enabled: true
|
||||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 192.168.0.14:8848
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 192.168.0.14:8848
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
# 配置文件格式
|
||||
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}
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
# Spring
|
||||
spring:
|
||||
cloud:
|
||||
loadbalancer:
|
||||
# 关闭Ribbon的负载均衡器
|
||||
ribbon:
|
||||
enabled: false
|
||||
# 开启Nacos的负载均衡器
|
||||
nacos:
|
||||
enabled: true
|
||||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
|
|
@ -9,26 +9,5 @@ spring:
|
|||
name: sgzb-material
|
||||
profiles:
|
||||
# 环境配置
|
||||
active: sgzb_cloud_dev
|
||||
cloud:
|
||||
loadbalancer:
|
||||
# 关闭Ribbon的负载均衡器
|
||||
ribbon:
|
||||
enabled: false
|
||||
# 开启Nacos的负载均衡器
|
||||
nacos:
|
||||
enabled: true
|
||||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 192.168.0.14:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 192.168.0.14:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
active: sgzb_cloud_local
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
<?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="com.bonus.sgzb.material.mapper.ToDoMapper_CQ">
|
||||
|
||||
<select id="getTaskType" resultType="com.bonus.sgzb.material.domain.ToDoBean">
|
||||
SELECT
|
||||
id as taskTypeId,`name` as taskType
|
||||
FROM
|
||||
sys_dic
|
||||
WHERE
|
||||
`status`='0'
|
||||
and p_id='0'
|
||||
and id not in (1,5,8,13,81)
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
<?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="com.bonus.sgzb.material.mapper.ToDoMapper_GZ">
|
||||
|
||||
<select id="getTaskType" resultType="com.bonus.sgzb.material.domain.ToDoBean">
|
||||
SELECT
|
||||
id as taskTypeId,`name` as taskType
|
||||
FROM
|
||||
sys_dic
|
||||
WHERE
|
||||
`status`='0'
|
||||
and p_id='0'
|
||||
and id not in (1,5,8,13,81)
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
@ -1,107 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<artifactId>sgzb-modules</artifactId>
|
||||
<groupId>com.bonus.sgzb</groupId>
|
||||
<version>3.6.3</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>sgzb-modules-settlement</artifactId>
|
||||
|
||||
<description>
|
||||
sgzb-modules-settlement
|
||||
</description>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.bonus.sgzb</groupId>
|
||||
<artifactId>sgzb-common-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.bonus.sgzb</groupId>
|
||||
<artifactId>sgzb-common-security</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.bonus.sgzb</groupId>
|
||||
<artifactId>sgzb-common-swagger</artifactId>
|
||||
</dependency>
|
||||
<!-- SpringCloud Alibaba Nacos -->
|
||||
<dependency>
|
||||
<groupId>com.alibaba.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- SpringCloud Alibaba Nacos Config -->
|
||||
<dependency>
|
||||
<groupId>com.alibaba.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- SpringCloud Alibaba Sentinel -->
|
||||
<dependency>
|
||||
<groupId>com.alibaba.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- SpringBoot Actuator -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Swagger UI -->
|
||||
<dependency>
|
||||
<groupId>io.springfox</groupId>
|
||||
<artifactId>springfox-swagger-ui</artifactId>
|
||||
<version>${swagger.fox.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Mysql Connector -->
|
||||
<dependency>
|
||||
<groupId>com.mysql</groupId>
|
||||
<artifactId>mysql-connector-j</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- RuoYi Common DataSource -->
|
||||
<dependency>
|
||||
<groupId>com.bonus.sgzb</groupId>
|
||||
<artifactId>sgzb-common-datasource</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- RuoYi Common DataScope -->
|
||||
<dependency>
|
||||
<groupId>com.bonus.sgzb</groupId>
|
||||
<artifactId>sgzb-common-datascope</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- RuoYi Common Log -->
|
||||
<dependency>
|
||||
<groupId>com.bonus.sgzb</groupId>
|
||||
<artifactId>sgzb-common-log</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- RuoYi Common Swagger -->
|
||||
<!-- RuoYi Common Swagger -->
|
||||
<dependency>
|
||||
<groupId>com.bonus.sgzb</groupId>
|
||||
<artifactId>sgzb-common-swagger</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-configuration-processor</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>8</maven.compiler.source>
|
||||
<maven.compiler.target>8</maven.compiler.target>
|
||||
</properties>
|
||||
|
||||
</project>
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
package com.bonus.sgzb.settlement;
|
||||
|
||||
|
||||
import com.bonus.sgzb.common.security.annotation.EnableCustomConfig;
|
||||
import com.bonus.sgzb.common.security.annotation.EnableRyFeignClients;
|
||||
import com.bonus.sgzb.common.swagger.annotation.EnableCustomSwagger2;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
|
||||
|
||||
/**
|
||||
* 结算服务
|
||||
*
|
||||
* @author ruoyi
|
||||
*/
|
||||
@EnableCustomSwagger2
|
||||
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
|
||||
@EnableCustomConfig
|
||||
@EnableRyFeignClients
|
||||
public class SgzbSettlementApplication
|
||||
{
|
||||
public static void main(String[] args)
|
||||
{
|
||||
SpringApplication.run(SgzbSettlementApplication.class, args);
|
||||
System.out.println("(♥◠‿◠)ノ゙ 结算模块启动成功 ლ(´ڡ`ლ)゙ \n" +
|
||||
" .-------. ____ __ \n" +
|
||||
" | _ _ \\ \\ \\ / / \n" +
|
||||
" | ( ' ) | \\ _. / ' \n" +
|
||||
" |(_ o _) / _( )_ .' \n" +
|
||||
" | (_,_).' __ ___(_ o _)' \n" +
|
||||
" | |\\ \\ | || |(_,_)' \n" +
|
||||
" | | \\ `' /| `-' / \n" +
|
||||
" | | \\ / \\ / \n" +
|
||||
" ''-' `'-' `-..-' ");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
Spring Boot Version: ${spring-boot.version}
|
||||
Spring Application Name: ${spring.application.name}
|
||||
_ __ _ _
|
||||
(_) / _|(_)| |
|
||||
_ __ _ _ ___ _ _ _ ______ | |_ _ | | ___
|
||||
| '__|| | | | / _ \ | | | || ||______|| _|| || | / _ \
|
||||
| | | |_| || (_) || |_| || | | | | || || __/
|
||||
|_| \__,_| \___/ \__, ||_| |_| |_||_| \___|
|
||||
__/ |
|
||||
|___/
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration scan="true" scanPeriod="60 seconds" debug="false">
|
||||
<!-- 日志存放路径 -->
|
||||
<property name="log.path" value="logs/ruoyi-file" />
|
||||
<!-- 日志输出格式 -->
|
||||
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
|
||||
|
||||
<!-- 控制台输出 -->
|
||||
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<pattern>${log.pattern}</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<!-- 系统日志输出 -->
|
||||
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<file>${log.path}/info.log</file>
|
||||
<!-- 循环政策:基于时间创建日志文件 -->
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<!-- 日志文件名格式 -->
|
||||
<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
|
||||
<!-- 日志最大的历史 60天 -->
|
||||
<maxHistory>60</maxHistory>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<pattern>${log.pattern}</pattern>
|
||||
</encoder>
|
||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
||||
<!-- 过滤的级别 -->
|
||||
<level>INFO</level>
|
||||
<!-- 匹配时的操作:接收(记录) -->
|
||||
<onMatch>ACCEPT</onMatch>
|
||||
<!-- 不匹配时的操作:拒绝(不记录) -->
|
||||
<onMismatch>DENY</onMismatch>
|
||||
</filter>
|
||||
</appender>
|
||||
|
||||
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<file>${log.path}/error.log</file>
|
||||
<!-- 循环政策:基于时间创建日志文件 -->
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<!-- 日志文件名格式 -->
|
||||
<fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
|
||||
<!-- 日志最大的历史 60天 -->
|
||||
<maxHistory>60</maxHistory>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<pattern>${log.pattern}</pattern>
|
||||
</encoder>
|
||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
||||
<!-- 过滤的级别 -->
|
||||
<level>ERROR</level>
|
||||
<!-- 匹配时的操作:接收(记录) -->
|
||||
<onMatch>ACCEPT</onMatch>
|
||||
<!-- 不匹配时的操作:拒绝(不记录) -->
|
||||
<onMismatch>DENY</onMismatch>
|
||||
</filter>
|
||||
</appender>
|
||||
|
||||
<!-- 系统模块日志级别控制 -->
|
||||
<logger name="com.ruoyi" level="info" />
|
||||
<!-- Spring日志级别控制 -->
|
||||
<logger name="org.springframework" level="warn" />
|
||||
|
||||
<root level="info">
|
||||
<appender-ref ref="console" />
|
||||
</root>
|
||||
|
||||
<!--系统操作日志-->
|
||||
<root level="info">
|
||||
<appender-ref ref="file_info" />
|
||||
<appender-ref ref="file_error" />
|
||||
</root>
|
||||
</configuration>
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>sgzb-modules-system</artifactId>
|
||||
<artifactId>sgzb-modules-system-1.0</artifactId>
|
||||
|
||||
<description>
|
||||
sgzb-modules-system系统模块
|
||||
|
|
|
|||
|
|
@ -0,0 +1,51 @@
|
|||
# Spring
|
||||
spring:
|
||||
servlet:
|
||||
multipart:
|
||||
max-request-size: 50MB
|
||||
max-file-size: 30MB
|
||||
cloud:
|
||||
loadbalancer:
|
||||
# 关闭Ribbon的负载均衡器
|
||||
ribbon:
|
||||
enabled: false
|
||||
# 开启Nacos的负载均衡器
|
||||
nacos:
|
||||
enabled: true
|
||||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
#腾讯云sms
|
||||
tencent:
|
||||
sms:
|
||||
#api秘钥标识
|
||||
accessKeyId: AKIDrreCVaRKDtMcgfU5QW9iEfv67tMfldJn
|
||||
#api秘钥
|
||||
accessKeySecret: OXUgeMo0yhBRTGo6sVu3yiFX4rQtAzc3
|
||||
#请求域名
|
||||
endpoint: sms.tencentcloudapi.com
|
||||
#所属区域
|
||||
region: ap-guangzhou
|
||||
#腾讯云申请应用id
|
||||
sdkAppId: 1400494336
|
||||
#签名
|
||||
smsSign: 南方电网互联网
|
||||
#云平台模板id 2116937-验收通知 2115503-登录验证
|
||||
templateId: 2116937,2115503
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
# Spring
|
||||
spring:
|
||||
servlet:
|
||||
multipart:
|
||||
max-request-size: 50MB
|
||||
max-file-size: 30MB
|
||||
cloud:
|
||||
loadbalancer:
|
||||
# 关闭Ribbon的负载均衡器
|
||||
ribbon:
|
||||
enabled: false
|
||||
# 开启Nacos的负载均衡器
|
||||
nacos:
|
||||
enabled: true
|
||||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 127.0.0.1:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
#腾讯云sms
|
||||
tencent:
|
||||
sms:
|
||||
#api秘钥标识
|
||||
accessKeyId: AKIDrreCVaRKDtMcgfU5QW9iEfv67tMfldJn
|
||||
#api秘钥
|
||||
accessKeySecret: OXUgeMo0yhBRTGo6sVu3yiFX4rQtAzc3
|
||||
#请求域名
|
||||
endpoint: sms.tencentcloudapi.com
|
||||
#所属区域
|
||||
region: ap-guangzhou
|
||||
#腾讯云申请应用id
|
||||
sdkAppId: 1400494336
|
||||
#签名
|
||||
smsSign: 南方电网互联网
|
||||
#云平台模板id 2116937-验收通知 2115503-登录验证
|
||||
templateId: 2116937,2115503
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -4,58 +4,10 @@ server:
|
|||
|
||||
# Spring
|
||||
spring:
|
||||
servlet:
|
||||
multipart:
|
||||
max-request-size: 50MB
|
||||
max-file-size: 30MB
|
||||
application:
|
||||
# 应用名称
|
||||
name: sgzb-system
|
||||
profiles:
|
||||
# 环境配置
|
||||
active: sgzb_cloud_dev
|
||||
cloud:
|
||||
loadbalancer:
|
||||
# 关闭Ribbon的负载均衡器
|
||||
ribbon:
|
||||
enabled: false
|
||||
# 开启Nacos的负载均衡器
|
||||
nacos:
|
||||
enabled: true
|
||||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 192.168.0.14:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 192.168.0.14:8848
|
||||
namespace: sgzb_cloud_dev_cqjj
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
#腾讯云sms
|
||||
tencent:
|
||||
sms:
|
||||
#api秘钥标识
|
||||
accessKeyId: AKIDrreCVaRKDtMcgfU5QW9iEfv67tMfldJn
|
||||
#api秘钥
|
||||
accessKeySecret: OXUgeMo0yhBRTGo6sVu3yiFX4rQtAzc3
|
||||
#请求域名
|
||||
endpoint: sms.tencentcloudapi.com
|
||||
#所属区域
|
||||
region: ap-guangzhou
|
||||
#腾讯云申请应用id
|
||||
sdkAppId: 1400494336
|
||||
#签名
|
||||
smsSign: 南方电网互联网
|
||||
#云平台模板id 2116937-验收通知 2115503-登录验证
|
||||
templateId: 2116937,2115503
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
active: sgzb_cloud_local
|
||||
|
||||
|
|
|
|||
|
|
@ -14,10 +14,10 @@ spring:
|
|||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 192.168.0.14:8848
|
||||
server-addr: 127.0.0.1:8848
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 192.168.0.14:8848
|
||||
server-addr: 127.0.0.1:8848
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
|
|
|
|||
Loading…
Reference in New Issue