|
@@ -27,19 +27,19 @@ server:
|
|
|
servlet:
|
|
servlet:
|
|
|
context-path: /js
|
|
context-path: /js
|
|
|
register-default-servlet: false
|
|
register-default-servlet: false
|
|
|
-# encoding.enabled: true
|
|
|
|
|
|
|
+ # encoding.enabled: true
|
|
|
tomcat:
|
|
tomcat:
|
|
|
uri-encoding: UTF-8
|
|
uri-encoding: UTF-8
|
|
|
# 表单请求数据的最大大小
|
|
# 表单请求数据的最大大小
|
|
|
max-http-form-post-size: 20MB
|
|
max-http-form-post-size: 20MB
|
|
|
-# # 进程的最大连接数
|
|
|
|
|
-# max-connections: 8192
|
|
|
|
|
-# # 连接数满后的排队个数
|
|
|
|
|
-# accept-count: 100
|
|
|
|
|
-# # 线程数最大和最小个数
|
|
|
|
|
-# threads:
|
|
|
|
|
-# max: 200
|
|
|
|
|
-# min-spare: 10
|
|
|
|
|
|
|
+ # # 进程的最大连接数
|
|
|
|
|
+ # max-connections: 8192
|
|
|
|
|
+ # # 连接数满后的排队个数
|
|
|
|
|
+ # accept-count: 100
|
|
|
|
|
+ # # 线程数最大和最小个数
|
|
|
|
|
+ # threads:
|
|
|
|
|
+ # max: 200
|
|
|
|
|
+ # min-spare: 10
|
|
|
|
|
|
|
|
# 当 Nginx 为 https,tomcat 为 http 时,设置该选项为 true
|
|
# 当 Nginx 为 https,tomcat 为 http 时,设置该选项为 true
|
|
|
schemeHttps: false
|
|
schemeHttps: false
|
|
@@ -54,13 +54,13 @@ jdbc:
|
|
|
# Mysql 数据库配置
|
|
# Mysql 数据库配置
|
|
|
type: mysql
|
|
type: mysql
|
|
|
driver: com.mysql.cj.jdbc.Driver
|
|
driver: com.mysql.cj.jdbc.Driver
|
|
|
- url: jdbc:mysql://127.0.0.1:3307/mes_cloud?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_dy?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://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
|
|
|
|
|
|
|
+# url: jdbc:mysql://192.168.9.181:3306/mes_cloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
|
|
|
# username: mes_cloud
|
|
# username: mes_cloud
|
|
|
-# password: YD57bSRabiyWBwkZ
|
|
|
|
|
|
|
+# password: s2ENj7KaEySTC7dW
|
|
|
username: root
|
|
username: root
|
|
|
- password: 123456
|
|
|
|
|
|
|
+ password: root
|
|
|
|
|
|
|
|
testSql: SELECT 1
|
|
testSql: SELECT 1
|
|
|
|
|
|
|
@@ -652,6 +652,15 @@ shiro:
|
|
|
${adminPath}/mes/mesProductRecord/pcresult = anon
|
|
${adminPath}/mes/mesProductRecord/pcresult = anon
|
|
|
${adminPath}/mes/mesProductRecord/pccreate = anon
|
|
${adminPath}/mes/mesProductRecord/pccreate = anon
|
|
|
${adminPath}/mes/mesProductRecord/getConfig = anon
|
|
${adminPath}/mes/mesProductRecord/getConfig = anon
|
|
|
|
|
+ ${adminPath}/mes/mesProductRecord/createOrder = anon
|
|
|
|
|
+ ${adminPath}/mes/mesProductRecord/startWork = anon
|
|
|
|
|
+ ${adminPath}/mes/mesProductRecord/bindRecord = anon
|
|
|
|
|
+ ${adminPath}/mes/mesProductRecord/unbindRecord = anon
|
|
|
|
|
+ ${adminPath}/mes/mesProductRecord/checkQualityMsg = anon
|
|
|
|
|
+ ${adminPath}/mes/mesProductRecord/updateQualityMsg = anon
|
|
|
|
|
+ ${adminPath}/mes/mesProductRecord/deviceState = anon
|
|
|
|
|
+ ${adminPath}/mes/mesProductRecord/updateParams = anon
|
|
|
|
|
+ ${adminPath}/mes/mesProductRecord/recordConfirm = anon
|
|
|
${adminPath}/mes/mesElectricTorque/batchSave = anon
|
|
${adminPath}/mes/mesElectricTorque/batchSave = anon
|
|
|
${adminPath}/mes/mesProductYgsl/batchsave = anon
|
|
${adminPath}/mes/mesProductYgsl/batchsave = anon
|
|
|
${adminPath}/mes/mesProductHb/upload = anon
|
|
${adminPath}/mes/mesProductHb/upload = anon
|
|
@@ -684,6 +693,9 @@ shiro:
|
|
|
${adminPath}/mes/mesProuctRecord/pcresult = anon
|
|
${adminPath}/mes/mesProuctRecord/pcresult = anon
|
|
|
${adminPath}/mes/mesProductRecord/pccheck = anon
|
|
${adminPath}/mes/mesProductRecord/pccheck = anon
|
|
|
${adminPath}/mes/mesProductRecord/pccreate = anon
|
|
${adminPath}/mes/mesProductRecord/pccreate = anon
|
|
|
|
|
+ ${adminPath}/mes/mesProductRecord/pcstart = anon
|
|
|
|
|
+ ${adminPath}/mes/mesProductRecord/pcbind = anon
|
|
|
|
|
+ ${adminPath}/mes/mesProductRecord/pcunbind = anon
|
|
|
${adminPath}/** = user
|
|
${adminPath}/** = user
|
|
|
|
|
|
|
|
|
|
|