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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
zhanghongqing
2018-09-12 17:36:49 +08:00
parent 745713979b 4ecbbf0dc2
commit 76e692f72d
45 changed files with 137 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java
View File

@@ -36,6 +36,7 @@ import com.nis.web.controller.configuration.CommonController;
*/
@Controller ///manipulation/ratelimit/domain/list?cfgName=domain_ratelimit
@RequestMapping("${adminPath}/manipulation/ratelimit")
@Deprecated
public class RatelimitController extends CommonController {
@RequestMapping(value = {"/ip/list"})
// @RequiresPermissions(value={"ip:ratelimit:config","ip:ratelimit:confirm"},logical=Logical.OR)

1
src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java
View File

@@ -35,6 +35,7 @@ import com.nis.web.controller.configuration.CommonController;
*/
@Controller
@RequestMapping("${adminPath}/proxy/control")
@Deprecated
public class ControlController extends CommonController {
@RequestMapping(value = {"/ip/list"})
// @RequiresPermissions(value={"control:ip:config","control:ip:confirm"},logical=Logical.OR)

9
src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
View File

@@ -13,22 +13,13 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.DnsResStrategy;
import com.nis.domain.configuration.HttpUrlCfg;
import com.nis.domain.configuration.InterceptPktBin;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.PxyObjKeyring;
import com.nis.domain.configuration.template.IpAddrTemplate;
import com.nis.exceptions.MaatConvertException;
import com.nis.web.controller.configuration.CommonController;
import com.nis.web.security.UserUtils;