gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户管理-用户类型vpn调整

Browse Source 
vpn服务器ip添加业务字典数据类型
ip校验、cgi服务国际化添加
This commit is contained in:
leijun
2018-12-05 10:03:45 +08:00
parent 53555aa73a
commit dd1862abce
14 changed files with 123 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/resources/messages/message_en.properties
View File

@@ -1333,8 +1333,10 @@ available_ip_total=Available IP Total
address_pool_id=Address Pool ID
log_to_cfg=Config
address_pool_is_used=Address pool is used and cannot perform this operation!
cgi_service_failed=Request CGI server failed
cgi_service_failed=Request CGI Server Failed
available_ip=Available IP
config_sync=Configuration Synchronization
info_failed=Information Acquisition Failure
address_pool_ip_configuration=Address Pool IP Configuration
address_pool_ip_configuration=Address Pool IP Configuration
cgi_failed=CGI Server
ip_check=Please enter a correct IP address

4
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1335,4 +1335,6 @@ cgi_service_failed=\u8BF7\u6C42CGI\u670D\u52A1\u63A5\u53E3\u5931\u8D25
available_ip=\u53EF\u7528IP\u5730\u5740
config_sync=\u914D\u7F6E\u540C\u6B65
info_failed=\u4FE1\u606F\u83B7\u53D6\u5931\u8D25
address_pool_ip_configuration=\u5730\u5740\u6C60 IP\u914D\u7F6E
address_pool_ip_configuration=\u5730\u5740\u6C60 IP\u914D\u7F6E
cgi_failed=CGI\u670D\u52A1
ip_check=\u8BF7\u586B\u5199\u6B63\u786E\u7684IP\u5730\u5740

5
src/main/resources/sql/20181120/add_data_dict.sql
View File

@@ -1,5 +1,6 @@
#用户管理字典信息
INSERT INTO `sys_data_dictionary_name` (`id`, `module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES ('145', '用户管理', 'USER_TYPE', '', 'user:管理员,2018-11-28 09:48:13edit|user:管理员,2018-11-27 17:50:11edit', '2018-11-27 17:38:36', '2018-11-28 09:48:13', '1');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3146', '0', 'VPN', '', '0', '1', '1', '145');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3147', '1', 'SIP', '', '0', '1', '1', '145');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3181', 'VPN', 'VPN', '', '0', '1', '1', '145');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3182', 'SIP', 'SIP', '', '0', '1', '1', '145');

2
src/main/resources/sql/20181120/add_user_manage.sql
View File

@@ -5,7 +5,7 @@ CREATE TABLE `user_manage` (
`user_name` varchar(255) NOT NULL,
`user_pwd` varchar(255) NOT NULL,
`server_ip` varchar(1000) NOT NULL,
`user_type` varchar(50) DEFAULT NULL,
`user_type` varchar(256) DEFAULT NULL,
`is_valid` int(11) NOT NULL COMMENT '0无效，1有效，-1删除\r\n',
`is_audit` int(11) NOT NULL COMMENT '0未审核，1审核通过，2审核未通过，3取消审核通过\r\n1） 审核未通过，配置可修改\r\n2） 审核通过，配置不可删除，只能取消审核通过',
`creator_id` int(11) NOT NULL COMMENT '取自sys_user.id',

5
src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql
View File

@@ -5,3 +5,8 @@ INSERT INTO `sys_data_dictionary_name` (`id`, `module_name`, `mark`, `remark`, `
#日志查询-出入口字典添加
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3168', '1', 'astana', 'astana', '0', '1', '1', '81');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3169', '2', 'almaty', 'almaty', '0', '1', '1', '81');
#VPN服务地址-业务字典数据类型添加
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3163', '5', 'vpn_ip', '数据类型：VPN 服务器IP', '0', '1', '1', '37');