diff --git a/erm.frontend/package.json b/erm.frontend/package.json index 0288aaf7..9b40cb15 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -93,7 +93,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.2.2", - "platform-core": "8.1.349", + "platform-core": "8.1.352", "quasar": "2.16.11", "tailwindcss": "3.4.10", "vue": "3.5.4", diff --git a/erm.frontend/public/index.html b/erm.frontend/public/index.html index 3af1ca9a..cf3966b6 100644 --- a/erm.frontend/public/index.html +++ b/erm.frontend/public/index.html @@ -20,6 +20,7 @@ + + + + + + +
-
- - {{alerts.current.message}} +
+ + {{alerts.current.message}} -
- {{alerts.queue.length + 1}} -
+
+ {{alerts.queue.length + 1}}
+
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/io.sc.platform.lcdp.frontend/public/flowable/modeler/libs/angular_1.3.13/angular.js b/io.sc.platform.lcdp.frontend/public/flowable/modeler/libs/angular_1.3.13/angular.js index af2bde6e..973ac79d 100644 --- a/io.sc.platform.lcdp.frontend/public/flowable/modeler/libs/angular_1.3.13/angular.js +++ b/io.sc.platform.lcdp.frontend/public/flowable/modeler/libs/angular_1.3.13/angular.js @@ -8736,7 +8736,7 @@ function $HttpProvider() { defaults.headers.common.Authorization=authenticationHeaders.headers.Authorization; } console.log(defaults); - + // end modify by wsp var useApplyAsync = false; @@ -26136,4 +26136,4 @@ var minlengthDirective = function() { })(window, document); -!window.angular.$$csp() && window.angular.element(document).find('head').prepend(''); \ No newline at end of file +!window.angular.$$csp() && window.angular.element(document).find('head').prepend(''); diff --git a/io.sc.platform.lcdp.frontend/public/flowable/modeler/scripts/app.js b/io.sc.platform.lcdp.frontend/public/flowable/modeler/scripts/app.js index 6a227ec3..5085e48b 100644 --- a/io.sc.platform.lcdp.frontend/public/flowable/modeler/scripts/app.js +++ b/io.sc.platform.lcdp.frontend/public/flowable/modeler/scripts/app.js @@ -349,11 +349,19 @@ flowableModeler } }; - $http.get(FLOWABLE.APP_URL.getAccountUrl()) + // begin modify by wsp + $http.get(FLOWABLE.APP_URL.getAccountUrl(),{ + headers:{ + Authorization: 'Bearer ' + localStorage.getItem('access_token'), + } + }) + //$http.get(FLOWABLE.APP_URL.getAccountUrl()) + // end modify by wsp .success(function (data, status, headers, config) { + console.log(headers); $rootScope.account = data; $rootScope.invalidCredentials = false; - $rootScope.authenticated = true; + $rootScope.authenticated = true; }); $rootScope.logout = function () { diff --git a/io.sc.platform.lcdp.frontend/public/index.html b/io.sc.platform.lcdp.frontend/public/index.html index 3af1ca9a..cf3966b6 100644 --- a/io.sc.platform.lcdp.frontend/public/index.html +++ b/io.sc.platform.lcdp.frontend/public/index.html @@ -20,6 +20,7 @@ + + + + +