多数据源配置

src/main/resources/config/application.yml

@@ -50,12 +50,11 @@ server:
 
 # 数据库连接
 jdbc:
-
   # Mysql 数据库配置
   type: mysql
   driver: com.mysql.cj.jdbc.Driver
+#  url: jdbc:mysql://127.0.0.1:3306/mes_cloud_ljr?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
   url: jdbc:mysql://127.0.0.1:3390/mes_cloud_x04c?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-#  url: jdbc:mysql://127.0.0.1:3306/mes_cloud_x04c?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
 #  url: jdbc:mysql://192.168.22.99:3306/mes_cloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
 #  username: mes_cloud
 #  password: YD57bSRabiyWBwkZ
@@ -64,6 +63,28 @@ jdbc:
 
   testSql: SELECT 1
 
+
+#     多数据源
+#  dataSourceNames : tianHong
+#  tianHong:
+#    type: mysql
+#    driver: com.mysql.cj.jdbc.Driver
+#    url: jdbc:mysql://127.0.0.1:3390/test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+#    username: root
+#    password: 123456
+#    testSql: SELECT 1
+#    encrypt:
+#      username: false
+#      password: false      # 注意：主库 password 加密是 true，新库如果密码是明文要设为 false
+#    pool:
+#      init: 1
+#      minIdle: 3
+#      maxActive: 20
+#
+#   这边表示这个jeesite.modules.tianHong.dao路径映射到从库
+#  mybatisDaoAndDataSourceMappings: |
+#    com.jeesite.modules.tianHong.dao = tianHong
+
 #  # Oracle 数据库配置（若使用 12c，请修改 /modules/core/pom.xml 文件，打开 12c 依赖，去掉 11g 依赖）
 #  type: oracle
 #  driver: oracle.jdbc.OracleDriver
@@ -648,9 +669,6 @@ shiro:
     ${adminPath}/mes/mesProcessCheckRecord/info = anon
     ${adminPath}/mes/mesProcessAlarm/alarmCount = anon
     ${adminPath}/mes/mesProductRecord/check = anon
-    ${adminPath}/mes/mesProductRecord/pccheck = anon
-    ${adminPath}/mes/mesProductRecord/pcresult = anon
-    ${adminPath}/mes/mesProductRecord/pccreate = anon
     ${adminPath}/mes/mesProductRecord/getConfig = anon
     ${adminPath}/mes/mesElectricTorque/batchSave = anon
     ${adminPath}/mes/mesProductYgsl/batchsave = anon
@@ -684,6 +702,40 @@ shiro:
     ${adminPath}/mes/mesProuctRecord/pcresult = anon
     ${adminPath}/mes/mesProductRecord/pccheck = anon
     ${adminPath}/mes/mesProductRecord/pccreate = anon
+    ${adminPath}/mes/mesProductRecord/pcresult = anon
+    ${adminPath}/mes/mesProductRecord/checkProduct = anon
+    ${adminPath}/mes/mesProductRecord/editProduct = anon
+    
+    ${adminPath}/mes/mesProductRecord/createProduct = anon
+    
+    
+    ${adminPath}/mes/mesProductRecord/pdacheck = anon
+    ${adminPath}/mes/mesProductRecord/pdaresult = anon
+    ${adminPath}/mes/mesProductRecord/padListData = anon
+    ${adminPath}/mes/mesProductRecord/padInfo = anon
+    ${adminPath}/mes/mesProductRecordApi/createProduct = anon
+    ${adminPath}/mes/mesQuality/cjList = anon
+    ${adminPath}/mes/mesQuality/cjList = anon
+    ${adminPath}/mes/mesQuality/cjList = anon
+    ${adminPath}/mes/mesLineProcess/processList = anon
+    ${adminPath}/mes/mes/mesQuality/checkProduct= anon
+    
+    ${adminPath}/mes/mesInspectionApi/genCode= anon
+    ${adminPath}/mes/mesInspectionApi/save= anon
+    ${adminPath}/mes/mesLineProcess/processListAll= anon
+    ${adminPath}/mes/mesProductOrderApi/mesProductOrderCodeList= anon
+    ${adminPath}/mes/wmsHouseControllerApi/wmsHouseList= anon
+    ${adminPath}/mes/mesInboundControllerApi/inboundSave= anon
+    ${adminPath}/mes/mesInboundControllerApi/mesInboundList= anon
+    ${adminPath}/mes/mesInspectionApi/mesInspectionList= anon
+    ${adminPath}/mes/mesInboundControllerApi/mesInboundList= anon
+    ${adminPath}/mes/mesUnpackApi/mesUnpackList= anon
+    
+    
+    
+    
+  
+    
     ${adminPath}/** = user
 
 
@@ -900,7 +952,7 @@ file:
   enabled: true
 
 #  # 文件上传根路径，设置路径中不允许包含“userfiles”，在指定目录中系统会自动创建userfiles目录，如果不设置默认为contextPath路径
-  baseDir: E:/mescloud
+  baseDir: D:/mescloud
 #  baseDir: /www/wwwroot/mes_cloud_dy
 #
 #  # 上传文件的相对路径（支持：yyyy, MM, dd, HH, mm, ss, E）
@@ -1003,3 +1055,17 @@ msg:
 #======================================#
 #========== Project settings ==========#
 #======================================#
+
+
+#======================================#
+#========== MES OPC UA / S7  ==========#
+#======================================#
+
+# FSW 采集（OPC UA / SINUMERIK 828D，DRIES 鼎捷点位）
+mes:
+  fsw:
+    enabled: true
+    opcua:
+      url: opc.tcp://10.0.20.141:4840
+      username: OpcUaClient
+      password: oPCuA_123