Ver Fonte

上线的版本

jingbo há 5 meses atrás
pai
commit
84f0470bfc

+ 1 - 1
pom.xml

@@ -11,7 +11,7 @@
 	</parent>
 
 
-	<artifactId>jee-mes-x04c</artifactId>
+	<artifactId>jee-mes-ahdy</artifactId>
 	<packaging>jar</packaging>
 	
 	<description>Web 服务,也可为分离端提供接口服务</description>

+ 1 - 1
src/main/java/com/jeesite/modules/scheduling/ProductGh.java

@@ -40,7 +40,7 @@ public class ProductGh {
     @Autowired
     private MesProductModifyRecordService mesProductModifyRecordService;
 
-    @Scheduled(fixedRate=30000)
+//    @Scheduled(fixedRate=30000)
     private void configureTasks() { //OP310
         try{
             MesLineProcess mesLineProcess = new MesLineProcess();

+ 15 - 6
src/main/resources/config/application.yml

@@ -54,13 +54,13 @@ jdbc:
   # Mysql 数据库配置
   type: mysql
   driver: com.mysql.cj.jdbc.Driver
-  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?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
-  username: root
-  password: root
+  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
+  password: s2ENj7KaEySTC7dW
+#  username: root
+#  password: root
 
   testSql: SELECT 1
 
@@ -652,6 +652,15 @@ shiro:
     ${adminPath}/mes/mesProductRecord/pcresult = anon
     ${adminPath}/mes/mesProductRecord/pccreate = 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/mesProductYgsl/batchsave = anon
     ${adminPath}/mes/mesProductHb/upload = anon