fix (farm): 生产计划

- 养殖类租户,打印网箱能力.

yudao-server/src/main/resources/application-gtr7.yaml

@@ -62,6 +62,7 @@ spring:
       host: ${redis.host}
       port: ${redis.port}
       database: ${redis.database}
+      username: ${redis.username}
       password: ${redis.password}
     mongodb:
       uri: mongodb://mongo_BiKBdR:mongo_KaShrX@223.83.129.121:27017/farming-platform-iot?authSource=farming-platform-iot

yudao-server/src/main/resources/application.yaml

@@ -345,6 +345,7 @@ spring:
         max-size: 32 # 最大线程数
         queue-capacity: 1000 # 队列容量
         keep-alive: 60s # 空闲线程存活时间
+
 # 万懋wms系统
 wms:
   hosts: ${wanmao.wms.hosts}
@@ -396,9 +397,17 @@ weather:
   url-1: https://restapi.amap.com/v3/geocode/regeo?location={0},{1}&key={2}   # 经纬度逆解析 GET
   url-2: https://restapi.amap.com/v3/weather/weatherInfo?city={0}&key={1}     # 获取天气信息 GET
 
+# 公司联系方式
 company:
   contact-number: 40088888
   email: weixucz@isoftstone.com
   address: 江西省南昌市xxx-xxx-C4-1717室
 
+# 打印机
+jby:
+  hosts: ${print.jby.hosts}
+  apikey: ${print.jby.api-key}
+  member-code: ${print.jby.member-code}
+  template-id: ${print.jby.template-id}
+  device-id: ${print.jby.device-id}
 

yudao-server/src/main/resources/db.properties

@@ -1,16 +1,17 @@
 #########################
-###########wanmao###########
+# wanmao server
 #########################
 
 mysql.url=jdbc:mysql://223.83.129.121:3360/farming-platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
-#mysql.url=jdbc:mysql://Mysql:3360/farming-platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
+#mysql.url=jdbc:mysql://Mysql:3306/farming-platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
 mysql.username=farming-platform
 mysql.password=wCM7fBMhFP3zNdJ3
 
 redis.host= 112.126.60.236
 #redis.host=Redis
 redis.port=65532
-redis.database=0
+redis.database=5
+redis.username=
 redis.password=luxifa970219
 
 wm.wx.mp.app-id=wx508d9a9ab84f67d0
@@ -27,34 +28,76 @@ wanmao.wms.hosts=https://wms.simple.gltec.cn/prod-api
 # gaode key
 gaode.weather.webkey=ea0a0486aaea8dbf9f68274df1160df3
 
+# print
+print.jby.hosts=http://api.poscom.cn/apisc/templetPrint
+print.jby.api-key=8KOSGN3SX11QV80IY8N6PYFMNF29R1N9
+print.jby.member-code=7A7453F04CB067987229F7BBAD888CFF
+print.jby.template-id=be64feabccf44de189f7019daa0dd7fb
+print.jby.device-id=00543113467925660
 
 
 
 
 
 
+#========================
+# wan mao server
+#========================
+
+#mysql.url=jdbc:mysql://rm-2ze979o6dt71z2mf6so.mysql.rds.aliyuncs.com:3306/farming-platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
+#mysql.username=root
+#mysql.password=Wm@123456
+#
+#redis.host=r-2zepgu4tu2ofnhhgzopd.redis.rds.aliyuncs.com
+#redis.port=6379
+#redis.database=5
+#redis.username=yunge
+#redis.password=Yunge123
+#
+#wm.wx.mp.app-id=wx508d9a9ab84f67d0
+#wm.wx.mp.secret=92c571b9973f9078c11da47a16c4094c
+#wm.wx.miniapp.app-id=wx508d9a9ab84f67d0
+#wm.wx.miniapp.secret=92c571b9973f9078c11da47a16c4094c
+#
+#wanmao.wms.url_1=getTenantByMobile
+## prod
+#wanmao.wms.hosts=https://wms.simple.gltec.cn/prod-api
+## test
+##wanmao.wms.hosts=47.111.15.9:8074/prod-api
+#
+## gaode key
+#gaode.weather.webkey=ea0a0486aaea8dbf9f68274df1160df3
+#
+## print
+#print.jby.hosts=http://api.poscom.cn/apisc/templetPrint
+#print.jby.api-key=8KOSGN3SX11QV80IY8N6PYFMNF29R1N9
+#print.jby.member-code=7A7453F04CB067987229F7BBAD888CFF
+#print.jby.template-id=be64feabccf44de189f7019daa0dd7fb
+#print.jby.device-id=00543113467925660
 
 
 
-#########################
-###########jishui###########
-#########################
+
+
+
+#========================
+# ji shui server
+#========================
 
 #mysql.url=jdbc:mysql://rm-bp10c7f0fou5efc95fo.mysql.rds.aliyuncs.com:3306/farming-platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
 #mysql.username=root
 #mysql.password=Jsnm2025
-#
+
 #redis.host=r-bp14zubs85fmfuhnw7pd.redis.rds.aliyuncs.com
 #redis.port=6379
 #redis.database=1
 #redis.password=m&wRPVcyy7Gl
-#
+
 #wm.wx.mp.app-id=wxde87f69bb4a2cf5c
 #wm.wx.mp.secret=a5e114df50a86c2578af255adba1c3e7
 #wm.wx.miniapp.app-id=wxde87f69bb4a2cf5c
 #wm.wx.miniapp.secret=a5e114df50a86c2578af255adba1c3e7
-#
+
 #wms.hosts=https://wms.jslstec.cn/prod-api
 #wms.url_1=getTenantByMobile
-#
-#weather.webkey=6e867624a911d74e673f5e68c52a61e7
+#gaode.weather.webkey=6e867624a911d74e673f5e68c52a61e7