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

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

@@ -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,

sgzb-modules/sgzb-file/src/main/resources/bootstrap-sgzb_cloud_dev.yml

@@ -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}
+
+
+
+
+
+
+

sgzb-modules/sgzb-file/src/main/resources/bootstrap-sgzb_cloud_local.yml

@@ -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}

sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml

@@ -2,28 +2,6 @@
 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:
   application:
@@ -31,19 +9,4 @@ spring:
     name: sgzb-file
   profiles:
     # 环境配置
-    active: sgzb_cloud_dev
+    active: sgzb_cloud_local
-  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}