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

Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

This commit is contained in:
BianLzhaoMin 2024-10-30 11:29:26 +08:00
parent 2a19a13a47 5d45f87488
commit ddc3f01092
4 changed files with 92 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
View File

@ -308,7 +308,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where m.rfid_code = #{rfidCode}
</select>
<select id="getMaMachineByMaIdAndMaCode" resultType="com.bonus.sgzb.base.api.domain.MaMachine">
select * from ma_machine where ma_id = #{maId} and ma_code = #{maCode}
select *
from ma_machine
where 1=1
<if test="maId != null "> and ma_id = #{maId}</if>
<if test="maCode != null and maCode != ''"> and ma_code = #{maCode}</if>
</select>
<select id="getMachineByQrCode" resultType="com.bonus.sgzb.base.api.domain.MaMachine">
select m.ma_id, m.type_id, m.ma_code, m.pre_code, m.ma_status, dic.name maStatusName, m.qr_code, m.buy_price, msi.supplier as maVender, m.out_fac_time, m.out_fac_code,

46
sgzb-modules/sgzb-file/src/main/resources/bootstrap-sgzb_cloud_dev.yml Normal file
View File

@ -0,0 +1,46 @@
# 腾讯云cos
tencent:
cos:
file:
# 存储桶所在地域
region: ap-guangzhou
# 存储桶所在地域
bucketregion: ap-guangzhou
# 存储桶名称
bucketname: prod-rental-1301524038
# API账号
secretid: AKIDrreCVaRKDtMcgfU5QW9iEfv67tMfldJn
# API密钥
secretkey: OXUgeMo0yhBRTGo6sVu3yiFX4rQtAzc3
file:
path: 1
prefix: 2
domain: 3
fdfs:
domain: 3
# Spring
spring:
cloud:
nacos:
discovery:
# 服务注册地址
server-addr: 192.168.0.14:8848
namespace: sgzb_cloud_dev_nxjj
config:
# 配置中心地址
server-addr: 192.168.0.14:8848
namespace: sgzb_cloud_dev_nxjj
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

39
sgzb-modules/sgzb-file/src/main/resources/bootstrap-sgzb_cloud_local.yml Normal file
View File

@ -0,0 +1,39 @@
# 腾讯云cos
tencent:
cos:
file:
# 存储桶所在地域
region: ap-guangzhou
# 存储桶所在地域
bucketregion: ap-guangzhou
# 存储桶名称
bucketname: prod-rental-1301524038
# API账号
secretid: AKIDrreCVaRKDtMcgfU5QW9iEfv67tMfldJn
# API密钥
secretkey: OXUgeMo0yhBRTGo6sVu3yiFX4rQtAzc3
file:
path: 1
prefix: 2
domain: 3
fdfs:
domain: 3
# Spring
spring:
cloud:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_nxjj
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev_nxjj
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

41
sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml
View File

@ -2,48 +2,11 @@
server:
port: 9300
# 腾讯云cos
tencent:
cos:
file:
# 存储桶所在地域
region: ap-guangzhou
# 存储桶所在地域
bucketregion: ap-guangzhou
# 存储桶名称
bucketname: prod-rental-1301524038
# API账号
secretid: AKIDrreCVaRKDtMcgfU5QW9iEfv67tMfldJn
# API密钥
secretkey: OXUgeMo0yhBRTGo6sVu3yiFX4rQtAzc3
file:
path: 1
prefix: 2
domain: 3
fdfs:
domain: 3
# Spring
spring:
spring:
application:
# 应用名称
name: sgzb-file
profiles:
# 环境配置
active: sgzb_cloud_dev
cloud:
nacos:
discovery:
# 服务注册地址
server-addr: 192.168.0.14:8848
namespace: sgzb_cloud_dev
config:
# 配置中心地址
server-addr: 192.168.0.14:8848
namespace: sgzb_cloud_dev
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
active: sgzb_cloud_local