1、服务重启后登录后首页框架加载错误的修正;2、国际化配置文件增加参数

This commit is contained in:
zhangwei
2018-05-21 16:29:16 +08:00
parent cd9b60d0e0
commit 46f43c6f5d
4 changed files with 89 additions and 9 deletions

View File

@@ -280,7 +280,7 @@ special_service=special service
service_name=service name
service_id=service ID
repeat=repeat
enter_error=enter a error
enter_error=enter error
single_service_message=single domain services can only associate one table
special_service_message=special services can only associate one table
table_name=table name
@@ -408,7 +408,6 @@ manager_info=the manager needs to specify the identity as the "manager",otherwis
name_existed=name existed
company_range=The department does not belong to the company
equal_password=Please enter the same password as above
enter_error=enter error
choose_org=choose organization
org_name=organization name
belong_area=belong area
@@ -479,14 +478,13 @@ allot=allot
role_type=role type
role_permission=role permission
task_allot=task allot
role_type_title=activiti\u67093\u79cd\u9884\u5b9a\u4e49\u7684\u7ec4\u7c7b\u578b:security-role,assignment,user \u5982\u679c\u4f7f\u7528Activiti Explorer,\u9700\u8981security-role\u624d\u80fd\u770b\u5230manage\u9875\u7b7e,\u9700\u8981assignment\u624d\u80fdclaim\u4efb\u52a1
role_type_title=activiti\u67093\u79CD\u9884\u5B9A\u4E49\u7684\u7EC4\u7C7B\u578B\:security-role,assignment,user \u5982\u679C\u4F7F\u7528Activiti Explorer,\u9700\u8981security-role\u624D\u80FD\u770B\u5230manage\u9875\u7B7E,\u9700\u8981assignment\u624D\u80FDclaim\u4EFB\u52A1
role_type_info=workflow group user type(task allocation:assignment,management role:security-role,ordinary role:user)
data_range_info=in special cases,\u8bbe\u7f6e\u4e3a"\u6309\u660e\u7ec6\u8bbe\u7f6e",\u53ef\u8fdb\u884c\u8de8\u673a\u6784\u6388\u6743
data_range_info=in special cases,\u8BBE\u7F6E\u4E3A"\u6309\u660E\u7EC6\u8BBE\u7F6E",\u53EF\u8FDB\u884C\u8DE8\u673A\u6784\u6388\u6743
permission_list=permission list
area_name=area name
area_code=area code
area_type=area type
area=area
longitude=longitude
latitude=latitude
@@ -515,3 +513,45 @@ custom_region=custom region
please_input=please input
area_control_type=area control type
#===============multiole cfg end====================
whitelist=whitelist
ip_whitelist=IP whitelist
domain_whitelist=domain whitelist
dns_ip_control=DNS IP control
dns_domain_control=DNS domain control
http_req_control=HTTP request control
http_ip_control=HTTP IP control
http_url_control=HTTP URL control
http_req_hdr_control=HTTP request header control
http_req_body_control=HTTP request body control
http_res_control=HTTP response control
http_res_hdr_control=HTTP response header control
http_res_body_control=HTTP response body control
av_control=av control
av_content_ip_control=content ip control
av_picture_ip_control=picture ip control
av_content_url_control=content url control
av_picture_url_control=picture url control
av_voip_control=VoIP control
av_voip_ip_control=VoIP IP control
av_voip_account_control=VoIP account control
av_sample_audio_control=audio sample control
av_sample_vedio_control=vedio sample control
av_sample_picture_control=picture sample control
av_sample_voip_control=VoIP sample control
av_sample_audio_porn_control=audio porn sample control
av_sample_vedio_porn_control=vedio porn sample control
av_sample_control=sample control
harm_level=harm level
src_file=src file
select_file=please select file
sample_file=sample file
sample_sign=sample sign
click_detail=please click\u201Cshow detail\u201Dbutton\uFF0Cview detailed error information\uFF0Cthanks\uFF01
return_lastpage=return last page
show_detail=view detail
hidden_detail=hide detail
notfound_page=not found page
no_permission=permission denied
param_error=param error,server can't analyze
request_service_failed=request server failed
request_error=request error

View File

@@ -339,3 +339,45 @@ custom_region=custom region
please_input=please input
area_control_type=area control type
#===============multiole cfg end====================
whitelist=whitelist
ip_whitelist=IP whitelist
domain_whitelist=domain whitelist
dns_ip_control=DNS IP control
dns_domain_control=DNS domain control
http_req_control=HTTP request control
http_ip_control=HTTP IP control
http_url_control=HTTP URL control
http_req_hdr_control=HTTP request header control
http_req_body_control=HTTP request body control
http_res_control=HTTP response control
http_res_hdr_control=HTTP response header control
http_res_body_control=HTTP response body control
av_control=av control
av_content_ip_control=content ip control
av_picture_ip_control=picture ip control
av_content_url_control=content url control
av_picture_url_control=picture url control
av_voip_control=VoIP control
av_voip_ip_control=VoIP IP control
av_voip_account_control=VoIP account control
av_sample_audio_control=audio sample control
av_sample_vedio_control=vedio sample control
av_sample_picture_control=picture sample control
av_sample_voip_control=VoIP sample control
av_sample_audio_porn_control=audio porn sample control
av_sample_vedio_porn_control=vedio porn sample control
av_sample_control=sample control
harm_level=harm level
src_file=src file
select_file=please select file
sample_file=sample file
sample_sign=sample sign
click_detail=please click\u201Cshow detail\u201Dbutton\uFF0Cview detailed error information\uFF0Cthanks\uFF01
return_lastpage=return last page
show_detail=view detail
hidden_detail=hide detail
notfound_page=not found page
no_permission=permission denied
param_error=param error,server can't analyze
request_service_failed=request server failed
request_error=request error

View File

@@ -554,4 +554,5 @@ hidden_detail=\u9690\u85CF\u4FE1\u606F\u4FE1\u606F
notfound_page=\u9875\u9762\u4E0D\u5B58\u5728
no_permission=\u6743\u9650\u4E0D\u8DB3
param_error=\u53C2\u6570\u6709\u8BEF\uFF0C\u670D\u52A1\u5668\u65E0\u6CD5\u89E3\u6790\u3002
request_service_failed=\u8BF7\u6C42\u670D\u52A1\u63A5\u53E3\u5931\u8D25
request_error=\u8BF7\u6C42\u9519\u8BEF

View File

@@ -28,9 +28,6 @@
$("#lang_text").html($obj.html());
$obj.parent("li").addClass("hide");
// === Search input typeahead === //
$('#searchText').typeahead({
source: function(query,process) {
@@ -371,7 +368,7 @@ window.onresize=function(){
</div>
<iframe id="mainFrame" name="mainFrame" width="100%" onload="changeFrameHeight()" src="${pageContext.request.contextPath }/nis/index" frameborder="0" srcolling="no">
<iframe id="mainFrame" name="mainFrame" width="100%" onload="changeFrameHeight()" frameborder="0" srcolling="no">
浏览器不支持嵌入式框架或配置为不显示嵌入式框架。
</iframe>