Skip to content

Commit

Permalink
fix bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
Bosn committed May 27, 2014
1 parent b92039b commit 4692ef7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
1 change: 0 additions & 1 deletion .settings/.jsdtscope
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.InternetExplorer"/>
<classpathentry kind="output" path=""/>
</classpath>
4 changes: 2 additions & 2 deletions WebContent/demo/mock.plugin/index.htm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<script src="http://g.tbcdn.cn/kissy/k/1.4.1/seed.js"></script>
<script src="http://code.jquery.com/jquery-1.11.0.js"></script>
<!-- 引入RAP开始 -->
<script src="http://etaoux-bj.taobao.ali.com:8080/rap.plugin.js?projectId=265"></script>
<script src="http://etaoux-bj.taobao.ali.com:8080/rap.plugin.js?projectId=65"></script>
<!-- 引入RAP结束 -->
</head>
<body>
Expand All @@ -15,7 +15,7 @@
KISSY.use([ 'node', 'ajax' ], {
success : function(S, Node, IO) {
IO({
url : '/id1090/RESTful_API_reg.json',
url : '/test3',
dataType : 'json',
type : 'get',
success : function(data) {
Expand Down
3 changes: 3 additions & 0 deletions src/com/taobao/rigel/rap/project/dao/impl/ProjectDaoImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,9 @@ public List<Action> getMatchedActionList(int projectId, String pattern) {
List<Action> result = new ArrayList<Action>();
for (Action action : list) {
String url = action.getRequestUrl();
if (url != null && !url.isEmpty() && url.charAt(0) != '/') {
url = "/" + url;
}
if (url.startsWith("reg:")) { // regular pattern
if (StringUtils.regMatch(url.substring(4), pattern)) {
result.add(action);
Expand Down

0 comments on commit 4692ef7

Please sign in to comment.