Skip to content

F
flowable-engine-fontend
Commit fb977b65 authored by 王万里's avatar 王万里
Browse files
Options

add: 调试完毕跨域

parent 452cadb7
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 141 deletions
.vscode/settings.json 0 → 100644
View file @ fb977b65
{
"liveServer.settings.port": 5501
}
\ No newline at end of file
editor-app/configuration/properties-form-reference-controller.js
View file @ fb977b65
......@@ -297,17 +297,17 @@ angular.module('flowableModeler').controller('FlowableFormReferencePopupCtrl',
})
var cookie = cookieKeyVal.split("=")[1]
$http.get(FLOWABLE.APP_URL.getFormModelsUrl(cookie))
.success(
function(response) {
$scope.state.loadingForms = false;
$scope.state.formError = false;
$scope.forms = response.getMe[0].data;
})
.error(
function(data, status, headers, config) {
$scope.state.loadingForms = false;
$scope.state.formError = true;
});
.success(
function(response) {
$scope.state.loadingForms = false;
$scope.state.formError = false;
$scope.forms = response.getMe[0].data;
})
.error(
function(data, status, headers, config) {
$scope.state.loadingForms = false;
$scope.state.formError = true;
});
};
if ($scope.property && $scope.property.value && $scope.property.value.id) {
......
nginx-config/nginx.conf deleted 100644 → 0
View file @ 452cadb7
#user nobody;
worker_processes auto;
#error_log logs/error.log;
#error_log logs/error.log notice;
#error_log logs/error.log info;
#pid logs/nginx.pid;
events {
worker_connections 1024;
}
http {
include mime.types;
# default_type application/octet-stream;
#log_format main '$remote_addr - $remote_user [$time_local] "$request" '
# '$status $body_bytes_sent "$http_referer" '
# '"$http_user_agent" "$http_x_forwarded_for"';
#access_log logs/access.log main;
# sendfile on;
#tcp_nopush on;
#keepalive_timeout 0;
# keepalive_timeout 65;
# gzip on;
server {
listen 8890;
server_name localhost;
charset utf-8;
root flowable-engine-fontend;
index index.html index.htm;
# access_log logs/host.access.log main;
location / {
}
location /idmweb/ {
proxy_pass http://localhost:9080/flowable-ui/;
}
location /adminweb/ {
proxy_pass http://localhost:9080/flowable-ui/;
}
location /taskweb/ {
proxy_pass http://localhost:9080/flowable-ui/;
}
location /modelerweb/ {
proxy_pass http://localhost:9080/flowable-ui/;
}
location /CityInterface/ {
proxy_pass http://localhost:8055;
}
# 想要被代理的接口地址：
# http://192.168.12.148:8890/idmfrontend/app/authentication
# 目标接口地址：
# http://192.168.12.148:9080/flowable-ui/app/authentication
}
# another virtual host using mix of IP-, name-, and port-based configuration
#
# 表单设计器
server {
listen 8891;
server_name localhost;
location / {
root form-render;
try_files $uri /index.html;
index index.html index.htm;
}
location /CityInterface/ {
proxy_pass http://localhost:8055;
}
}
# HTTPS server
#
#server {
# listen 443 ssl;
# server_name localhost;
# ssl_certificate cert.pem;
# ssl_certificate_key cert.key;
# ssl_session_cache shared:SSL:1m;
# ssl_session_timeout 5m;
# ssl_ciphers HIGH:!aNULL:!MD5;
# ssl_prefer_server_ciphers on;
# location / {
# root html;
# index index.html index.htm;
# }
#}
}
scripts/app-cfg.js
View file @ fb977b65
......@@ -19,6 +19,8 @@ var FLOWABLE = FLOWABLE || {};
var pathname = window.location.pathname.replace(/^(\/[^\/]*)(\/.*)?modeler\/?$/, '$1').replace(/\/$/, '');
console.log(pathname)
// FLOWABLE.CONFIG = {
// 'onPremise' : true,
// 'contextRoot' : pathname,
......@@ -29,8 +31,8 @@ var pathname = window.location.pathname.replace(/^(\/[^\/]*)(\/.*)?modeler\/?$/,
FLOWABLE.CONFIG = {
'onPremise' : true,
'contextRoot' : "/modelerweb",
'contextModelerRestRoot' : "/modelerweb" + '/modeler-app',
'contextRoot' : "/flowable-ui",
'contextModelerRestRoot' : "/flowable-ui" + '/modeler-app',
'webContextRoot' : pathname,
'datesLocalization' : false
};
scripts/configuration/url-config.js
View file @ fb977b65
......@@ -195,34 +195,31 @@ FLOWABLE.APP_URL = {
},
/* FORM MODEL URLS */
// 获取模型列表
getFormModelsUrl: function (cookie) {
// return FLOWABLE.CONFIG.contextModelerRestRoot + '/rest/form-models';
// return 'http://192.168.12.44:8089/CityInterface/rest/services/PandaWorkflow.svc/GetFormModelList?Cookie=' + cookie;
return '/CityInterface/rest/services/PandaWorkflow.svc/GetFormModelList?Cookie=' + cookie;
return 'http://localhost:8089/CityInterface/rest/services/PandaWorkflow.svc/GetFormModelList?Cookie=' + cookie;
},
// 获取模型详情
getFormModelDetail: function(id, key, cookie) {
return '/CityInterface/rest/services/PandaWorkflow.svc/GetModelDetail?ModelID=' + id + '&Model_key=' + key +'&Cookie=' + cookie
return 'http://localhost:8089/CityInterface/rest/services/PandaWorkflow.svc/GetModelDetail?ModelID=' + id + '&Model_key=' + key +'&Cookie=' + cookie
},
// 获取字段配置信息
GetColumnConfig:function(ACTID, FORMKEY) {
return `/CityInterface/rest/services/PandaWorkflow.svc/GetColumnConfig?ActID=${ACTID}&FormKey=${FORMKEY}`
return `http://localhost:8089/CityInterface/rest/services/PandaWorkflow.svc/GetColumnConfig?ActID=${ACTID}&FormKey=${FORMKEY}`
},
// 保存单个字段配置信息
SaveFieldConfig:function() {
return `/CityInterface/rest/services/PandaWorkflow.svc/SaveFieldConfig`
return `http://localhost:8089/CityInterface/rest/services/PandaWorkflow.svc/SaveFieldConfig`
},
// 保存整个表单字段配置信息
SaveColumnConfig:function(ACTID, FORMKEY) {
return `/CityInterface/rest/services/PandaWorkflow.svc/SaveColumnConfig?ActID=${ACTID}&FormKey=${FORMKEY}`
return `http://localhost:8089/CityInterface/rest/services/PandaWorkflow.svc/SaveColumnConfig?ActID=${ACTID}&FormKey=${FORMKEY}`
},
// 获取员工列表
getStaffList: function() {
return '/Cityinterface/rest/services/CountyProduct.svc/AccountManage/getUserListForRole?_version=9999'
return 'http://localhost:8089/Cityinterface/rest/services/PandaWorkflow.svc/getUserListForRole?_version=9999'
},
getFormModelValuesUrl: function (query) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment