beiwei30 closed pull request #42: bug fix in route add
URL: https://github.com/apache/incubator-dubbo-ops/pull/42
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/dubbo-admin/pom.xml b/dubbo-admin/pom.xml
index 6d357eb..1d15605 100644
--- a/dubbo-admin/pom.xml
+++ b/dubbo-admin/pom.xml
@@ -36,19 +36,6 @@
<scope>test</scope>
</dependency>
-
- <!--<dependency>-->
- <!--<groupId>org.apache.velocity</groupId>-->
- <!--<artifactId>velocity</artifactId>-->
- <!--<version>1.7</version>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.velocity</groupId>-->
- <!--<artifactId>velocity-tools</artifactId>-->
- <!--<version>2.0</version>-->
- <!--</dependency>-->
-
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>velocity-spring-boot-starter</artifactId>
diff --git
a/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/RouterController.java
b/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/RouterController.java
index 55527df..0c01951 100644
---
a/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/RouterController.java
+++
b/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/RouterController.java
@@ -20,7 +20,9 @@
import java.lang.reflect.Method;
import java.util.Map;
+import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.dubboadmin.SpringUtil;
@@ -214,28 +216,34 @@ public String appAction(@RequestParam Map<String, String>
params, @PathVariable(
if (method.getName().equals(action)) {
Class<?> param = method.getParameterTypes()[0];
try {
- Object value = param.newInstance();
- Method[] mms = param.getDeclaredMethods();
- for (Method m : mms) {
- if
(m.getName().toLowerCase().startsWith("set")) {
- String methodName = m.getName();
- String key =
methodName.substring(3).toLowerCase();
- String tmp = params.get(key);
- Object obj = tmp;
- if (tmp != null) {
- Class<?> t =
m.getParameterTypes()[0];
- if (isPrimitive(t)) {
- obj = convertPrimitive(t, tmp);
+ if
(!param.isAssignableFrom(HttpServletRequest.class)) {
+ Object value = param.newInstance();
+ Method[] mms = param.getDeclaredMethods();
+ for (Method m : mms) {
+ if
(m.getName().toLowerCase().startsWith("set")) {
+ String methodName = m.getName();
+ String key =
methodName.substring(3).toLowerCase();
+ String tmp = params.get(key);
+ Object obj = tmp;
+ if (tmp != null) {
+ Class<?> t =
m.getParameterTypes()[0];
+ if (isPrimitive(t)) {
+ obj = convertPrimitive(t,
tmp);
+ }
+ m.invoke(value, obj);
}
- m.invoke(value, obj);
- }
+ }
}
+ return (String)method.invoke(controller,
value, request, response, model);
+ } else {
+ return (String)method.invoke(controller,
request, response, model);
}
- return (String)method.invoke(controller,
value, request, response, model);
} catch (Exception e) {
e.printStackTrace();
}
+
+
}
}
} else {
@@ -313,6 +321,4 @@ public String appActionWithIdandAction(@PathVariable("app")
String app, @PathVar
return "";
}
-
-
}
diff --git
a/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/governance/OverridesController.java
b/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/governance/OverridesController.java
index a6249fc..da7ead3 100644
---
a/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/governance/OverridesController.java
+++
b/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/governance/OverridesController.java
@@ -334,7 +334,7 @@ public String create(Override override, HttpServletRequest
request,
}
model.addAttribute("success", success);
- model.addAttribute("redirect", "governance/overrides");
+ model.addAttribute("redirect", "../overrides");
return "governance/screen/redirect";
}
@@ -355,7 +355,7 @@ public String update(Override override, HttpServletRequest
request,
}
model.addAttribute("success", succcess);
- model.addAttribute("redirect", "governance/overrides");
+ model.addAttribute("redirect", "../overrides");
return "governance/screen/redirect";
}
@@ -369,7 +369,7 @@ public String delete(@PathVariable("ids") Long[] ids,
HttpServletRequest request
}
model.addAttribute("success", true);
- model.addAttribute("redirect", "governance/overrides");
+ model.addAttribute("redirect", "../../overrides");
return "governance/screen/redirect";
}
@@ -384,14 +384,14 @@ public String enable(@PathVariable("ids") Long[] ids,
HttpServletRequest request
model.addAttribute("message",
getMessage("NoSuchOperationData", id));
success = false;
model.addAttribute("success", success);
- model.addAttribute("redirect", "governance/overrides");
+ model.addAttribute("redirect", "../../overrides");
return "governance/screen/redirect";
} else {
if
(!super.currentUser.hasServicePrivilege(override.getService())) {
model.addAttribute("message",
getMessage("HaveNoServicePrivilege", override.getService()));
success = false;
model.addAttribute("success", success);
- model.addAttribute("redirect", "governance/overrides");
+ model.addAttribute("redirect", "../../overrides");
return "governance/screen/redirect";
}
}
@@ -402,7 +402,7 @@ public String enable(@PathVariable("ids") Long[] ids,
HttpServletRequest request
}
model.addAttribute("success", success);
- model.addAttribute("redirect", "governance/overrides");
+ model.addAttribute("redirect", "../../overrides");
return "governance/screen/redirect";
}
@@ -417,14 +417,14 @@ public String disable(@PathVariable("ids") Long[] ids,
HttpServletRequest reques
model.addAttribute("message",
getMessage("NoSuchOperationData", id));
success = false;
model.addAttribute("success", success);
- model.addAttribute("redirect", "governance/overrides");
+ model.addAttribute("redirect", "../../overrides");
return "governance/screen/redirect";
} else {
if
(!super.currentUser.hasServicePrivilege(override.getService())) {
model.addAttribute("message",
getMessage("HaveNoServicePrivilege", override.getService()));
success = false;
model.addAttribute("success", success);
- model.addAttribute("redirect", "governance/overrides");
+ model.addAttribute("redirect", "../../overrides");
return "governance/screen/redirect";
}
}
@@ -434,7 +434,7 @@ public String disable(@PathVariable("ids") Long[] ids,
HttpServletRequest reques
overrideService.disableOverride(id);
}
model.addAttribute("success", success);
- model.addAttribute("redirect", "governance/overrides");
+ model.addAttribute("redirect", "../../overrides");
return "governance/screen/redirect";
}
diff --git
a/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/governance/WeightsController.java
b/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/governance/WeightsController.java
index c532577..d94428a 100644
---
a/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/governance/WeightsController.java
+++
b/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/governance/WeightsController.java
@@ -155,20 +155,20 @@ public String create(HttpServletRequest request,
HttpServletResponse response, M
if (!IP_PATTERN.matcher(ip).matches()) {
model.addAttribute("message", "illegal IP: " + s);
model.addAttribute("success", false);
- model.addAttribute("redirect", "governance/weights");
+ model.addAttribute("redirect", "../weights");
return "governance/screen/redirect";
}
if (LOCAL_IP_PATTERN.matcher(ip).matches() ||
ALL_IP_PATTERN.matcher(ip).matches()) {
model.addAttribute("message", "local IP or any host ip is
illegal: " + s);
model.addAttribute("success", false);
- model.addAttribute("redirect", "governance/weights");
+ model.addAttribute("redirect", "../weights");
return "governance/screen/redirect";
}
if (port != null) {
if (!NumberUtils.isDigits(port)) {
model.addAttribute("message", "illegal port: " + s);
model.addAttribute("success", false);
- model.addAttribute("redirect", "governance/weights");
+ model.addAttribute("redirect", "../weights");
return "governance/screen/redirect";
}
}
@@ -190,7 +190,7 @@ public String create(HttpServletRequest request,
HttpServletResponse response, M
if (!super.currentUser.hasServicePrivilege(s)) {
model.addAttribute("message",
getMessage("HaveNoServicePrivilege", s));
model.addAttribute("success", false);
- model.addAttribute("redirect", "governance/weights");
+ model.addAttribute("redirect", "../weights");
return "governance/screen/redirect";
}
aimServices.add(s);
@@ -208,7 +208,7 @@ public String create(HttpServletRequest request,
HttpServletResponse response, M
}
}
model.addAttribute("success", true);
- model.addAttribute("redirect", "governance/weights");
+ model.addAttribute("redirect", "../weights");
return "governance/screen/redirect";
}
@@ -289,7 +289,7 @@ public String delete(@PathVariable("ids") Long[] ids,
HttpServletRequest request
model.addAttribute("message",
getMessage("HaveNoServicePrivilege", w.getService()));
success = false;
model.addAttribute("success", success);
- model.addAttribute("redirect", "governance/weights");
+ model.addAttribute("redirect", "../../weights");
return "governance/screen/redirect";
}
}
@@ -298,7 +298,7 @@ public String delete(@PathVariable("ids") Long[] ids,
HttpServletRequest request
overrideService.deleteOverride(id);
}
model.addAttribute("success", success);
- model.addAttribute("redirect", "governance/weights");
+ model.addAttribute("redirect", "../../weights");
return "governance/screen/redirect";
}
diff --git a/dubbo-admin/src/main/resources/log4j.properties
b/dubbo-admin/src/main/resources/log4j.properties
new file mode 100644
index 0000000..5be84a2
--- /dev/null
+++ b/dubbo-admin/src/main/resources/log4j.properties
@@ -0,0 +1,37 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+log4j.rootCategory=INFO, stdout, file
+log4j.logger.org.apache=ERROR
+
+
+# 控制台输出
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.target=System.out
+log4j.appender.stdout.Threshold=INFO
+log4j.appender.stdout.encoding=GBK
+log4j.appender.stdout.layout.ConversionPattern=%5p %c{2} - %m%n
+
+# 文件输出
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.file=dubbo-governance.log
+log4j.appender.file.Threshold=INFO
+log4j.appender.file.append=true
+log4j.appender.file.maxFileSize=10MB
+log4j.appender.file.maxBackupIndex=100
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d [%t] %-5p %C{6} (%F:%L) - %m%n
\ No newline at end of file
diff --git
a/dubbo-admin/src/main/resources/templates/governance/screen/weights/index.vm
b/dubbo-admin/src/main/resources/templates/governance/screen/weights/index.vm
index 6630119..d46362f 100644
---
a/dubbo-admin/src/main/resources/templates/governance/screen/weights/index.vm
+++
b/dubbo-admin/src/main/resources/templates/governance/screen/weights/index.vm
@@ -20,7 +20,7 @@
class="ico_font">#springMessage("add")</span></a>
<span class="ico_line">|</span>
<a href="#" onclick="if(! hasCheckbox('ids')) {
showAlert('#springMessage(
- "empty.list")'); } else if(! h asChecked('ids')) {
showAlert('#springMessage(
+ "empty.list")'); } else if(! hasChecked('ids')) {
showAlert('#springMessage(
"please.select")'); } else { showConfirm('#springMessage(
"confirm.batch.delete")', 'weights/' + getChecked('ids') +
'/delete'); } return false;"><img
src="$rootContextPath.getURI("images/ico_delete.png")"
width="12" height="12"/><span
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
