fix: 解决冲突

de03a8d5 · 阮传宙 · 6a7aeaae · dfe2c874 · de03a8d5 · de03a8d5
Commit de03a8d5 authored Jul 28, 2023 by 阮传宙
18 changed files
--- a/src/template/deployment/bin/standalone.bat
+++ b/src/template/deployment/bin/standalone.bat
--- a/src/template/deployment/bin/standalone.sh
+++ b/src/template/deployment/bin/standalone.sh
--- a/src/template/deployment/conf/bootstrap.yml
+++ b/src/template/deployment/conf/bootstrap.yml
@@ -171,7 +171,7 @@ security:
 dynamic-datasource:
  intercept:
-    # ignoringUrls: /static/**,/v2/api-docs,/swagger-resources/**,/swagger-ui.html,/css/**,/js/**,/images/**,/webjars/**,/favicon.ico,/middle-api/**,/ws/**,/upload/**,/index/**,/assets/**,/edgebase/v1/cms/io/publish,/admin/**,/auth/**,/error,/ws/**,/bi/**,/logic/magic-api/clear-cache
+    #ignoringUrls: /static/**,/v2/api-docs,/swagger-resources/**,/swagger-ui.html,/css/**,/js/**,/images/**,/webjars/**,/favicon.ico,/middle-api/**,/ws/**,/upload/**,/index/**,/assets/**,/edgebase/v1/cms/io/publish,/admin/**,/auth/**,/error,/ws/**,/bi/**,/logic/magic-api/clear-cache
    ignoringUrls: /** #适用于runtime
 metadata:

--- a/src/template/deployment/lib/syc-bm-upms-api-5.8.0-pro-SNAPSHOT.jar
+++ b/src/template/deployment/lib/syc-bm-upms-api-5.8.0-pro-SNAPSHOT.jar
--- a/src/template/deployment/lib/syc-bm-upms-biz-5.8.0-pro-SNAPSHOT.jar
+++ b/src/template/deployment/lib/syc-bm-upms-biz-5.8.0-pro-SNAPSHOT.jar
--- a/src/template/deployment/lib/syc-paas-logic-flow-api-5.8.0-20230717.092205-15.jar
+++ b/src/template/deployment/lib/syc-paas-logic-flow-api-5.8.0-20230717.092205-15.jar
--- a/src/template/deployment/lib/syc-paas-logic-flow-biz-5.8.0-20230717.092313-15.jar
+++ b/src/template/deployment/lib/syc-paas-logic-flow-biz-5.8.0-20230717.092313-15.jar
--- a/src/template/deployment/lib/syc-paas-logic-flow-common-5.8.0-20230717.092212-15.jar
+++ b/src/template/deployment/lib/syc-paas-logic-flow-common-5.8.0-20230717.092212-15.jar
--- a/src/template/deployment/lib/syc-paas-logic-flow-core-5.8.0-20230717.092230-15.jar
+++ b/src/template/deployment/lib/syc-paas-logic-flow-core-5.8.0-20230717.092230-15.jar
--- a/src/template/deployment/lib/syc-paas-logic-flow-core-5.8.0-SNAPSHOT.jar
+++ b/src/template/deployment/lib/syc-paas-logic-flow-core-5.8.0-SNAPSHOT.jar
--- a/src/template/deployment/lib/syc-paas-logic-flow-file-node-5.8.0-20230717.092257-15.jar
+++ b/src/template/deployment/lib/syc-paas-logic-flow-file-node-5.8.0-20230717.092257-15.jar
--- a/src/template/deployment/lib/syc-paas-logic-flow-form-5.8.0-20230717.092247-15.jar
+++ b/src/template/deployment/lib/syc-paas-logic-flow-form-5.8.0-20230717.092247-15.jar
--- a/src/template/deployment/lib/syc-paas-logic-flow-magic-5.8.0-20230717.092217-15.jar
+++ b/src/template/deployment/lib/syc-paas-logic-flow-magic-5.8.0-20230717.092217-15.jar
--- a/src/template/deployment/lib/syc-paas-logic-flow-node-5.8.0-20230717.092229-15.jar
+++ b/src/template/deployment/lib/syc-paas-logic-flow-node-5.8.0-20230717.092229-15.jar
--- a/src/template/deployment/lib/syc-paas-logic-flow-scheduler-5.8.0-20230717.092303-15.jar
+++ b/src/template/deployment/lib/syc-paas-logic-flow-scheduler-5.8.0-20230717.092303-15.jar
--- a/src/template/deployment/lib/syc-paas-metadata-api-5.5.5-pro-20230724.035356-76.jar
+++ b/src/template/deployment/lib/syc-paas-metadata-api-5.5.5-pro-20230724.035356-76.jar
--- a/src/template/deployment/lib/syc-paas-metadata-biz-5.5.5-pro-20230724.035511-77.jar
+++ b/src/template/deployment/lib/syc-paas-metadata-biz-5.5.5-pro-20230724.035511-77.jar
--- a/src/template/deployment/lib/syc-paas-standalone-biz-5.3.0-SNAPSHOT.jar
+++ b/src/template/deployment/lib/syc-paas-standalone-biz-5.3.0-SNAPSHOT.jar