Skip to content

Commit 1a1e68c

Browse files
committed
fix #3 build ok on jdk8
1 parent c9c8d84 commit 1a1e68c

File tree

11 files changed

+42
-27
lines changed

11 files changed

+42
-27
lines changed

.gitignore

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
*.sw?
2+
.#*
3+
*#
4+
*~
5+
.classpath
6+
.project
7+
.settings
8+
bin
9+
build
10+
target
11+
dependency-reduced-pom.xml
12+
*.sublime-*
13+
/scratch
14+
.gradle
15+
README.html
16+
*.iml
17+
.idea
18+
.DS_Store

memcloud-dns/src/main/java/io/memcloud/memdns/action/DNSAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public String create() {
8686
return REST("create");
8787
}
8888

89-
/**
89+
/*
9090
* 提供给管理员判断某个应用的集群分配情况与DNS发布情况是否一致
9191
* @param appid/paramId 应用ID
9292
* @return 0、[400,500) 输入参数错误;1、否则一定输出:memGroupSize,appConfSize和sync (对象信息:appDesc,appConf和memGroup)

memcloud-dns/src/main/java/io/memcloud/memdns/action/GroupAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class GroupAction extends BaseAction {
2525
private IMemInstanceDirector memInstanceDirector;
2626

2727

28-
/**
28+
/*
2929
* @param appid 应用ID
3030
* @return 应用的Memcached集群
3131
* */

memcloud-dns/src/main/java/io/memcloud/memdns/action/ScaleAction.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public String create() {
9595
return REST("create");
9696
}
9797

98-
/**
98+
/*
9999
* 当前登录用户申请过的扩容请求列表
100100
* */
101101
@Override
@@ -106,7 +106,7 @@ public String index() {
106106
return REST("index");
107107
}
108108

109-
/** 管理员查批(展示待审列表) */
109+
/* 管理员查批(展示待审列表) */
110110
public String adminidx() {
111111
short status = ScaleoutAppeal.STATUS_WAITING;
112112
if ((ScaleoutAppeal.STATUS_PASSED+"").equals(getParam("status"))) {
@@ -119,7 +119,7 @@ public String adminidx() {
119119
return REST("adminidx");
120120
}
121121

122-
/**
122+
/*
123123
* 管理员审批某个具体的申请
124124
* @param paramId 审核申请记录的ID
125125
* @param action 可选,默认是空,表示查询。reject 表示驳回拒批; accept 表示通过审批,但是数量不一定跟用户申请的一样。

memcloud-dns/src/main/java/io/memcloud/memdns/action/SessionAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class SessionAction extends BaseAction {
2323
private IHttpTracker httpTracker;
2424

2525

26-
/**
26+
/*
2727
* @param u 账号名
2828
* @param p 密码
2929
* @return 登录凭证COOKIE

memcloud-dns/src/main/java/io/memcloud/memdns/action/ShardAction.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import io.memcloud.stats.dao.IMemStatDao;
1616
import io.memcloud.stats.model.MemStatSummary;
1717

18-
/**
19-
* 我的监控->全部实例(把所有应用的分片情况都列表出来)
18+
/*
19+
* 我的监控=>全部实例(把所有应用的分片情况都列表出来)
2020
* */
2121
public class ShardAction extends BaseAction {
2222

@@ -31,7 +31,7 @@ public class ShardAction extends BaseAction {
3131
@Resource(name = "memStatDao")
3232
private IMemStatDao memStatDao;
3333

34-
/**
34+
/*
3535
* 前提:登录
3636
* 我的监控->全部实例(把所有应用的分片情况都列表出来)
3737
* */

memcloud-dns/src/main/java/io/memcloud/memdns/business/IMemDNSPublisher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
public interface IMemDNSPublisher {
88

9-
/** 发布某个应用的最新配置 */
9+
/* 发布某个应用的最新配置 */
1010
public AppConfAudit publishAppConf(AppDesc appDesc, long userId);
1111

1212
// public AppConfAudit publishAppConf(long appId, long userId);

memcloud-dns/src/main/java/io/memcloud/memdns/business/IMemInstanceDirector.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
public interface IMemInstanceDirector {
1212

13-
/** 引进新的MemInstance资源,方法是幂等的 */
13+
/* 引进新的MemInstance资源,方法是幂等的 */
1414
public MemInstance bringin(String memCmd);
1515

1616
/**
@@ -19,6 +19,7 @@ public interface IMemInstanceDirector {
1919
* @param shardAmount 申请分片的数量
2020
* @param memSizeM 每个Memcache实例的内存大小
2121
* @return 返回分配情况。NULL 表示没有足够资源,非空不一定表示完全申请好,可能申请5个分片,实际只成功3个分片。
22+
* @throws ConcurrencyProblemException 并发异常
2223
* */
2324
public List<AppMemGroup> allocate(AppDesc appDesc,int shardAmount, int memSizeM) throws ConcurrencyProblemException;
2425

memcloud-dns/src/main/java/io/memcloud/memdns/interceptor/SrcIPAuthInterceptor.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,24 @@ protected String doIntercept(ActionInvocation invocation) throws Exception {
3636
}
3737
}
3838

39-
/** 源IP是否认证通过*/
39+
/* 源IP是否认证通过*/
4040
protected boolean authPassed(String srcip) {
4141
if(srcip==null) {
4242
return false;
4343
}
4444
String scopelist = srciplist;
45-
if("*".equals(scopelist)) {//只支持一个统配
45+
if("*".equals(scopelist)) { // 只支持一个统配
4646
return true;
4747
}
4848
scopelist = DynamicProperties.parseRefProperty(srciplist);
49-
if(StringUtils.isEmpty(scopelist)) {//表示不允许任何源IP访问
49+
if(StringUtils.isEmpty(scopelist)) { // 表示不允许任何源IP访问
5050
return false;
5151
}
52-
if("*".equals(scopelist)) {//只支持一个统配
52+
if("*".equals(scopelist)) { // 只支持一个统配
5353
return true;
5454
}
5555
scopelist = (","+scopelist+",");
56-
if(scopelist.indexOf(srcip+",") != -1) {//表示当前源IP在允许的范围内
56+
if(scopelist.indexOf(srcip+",") != -1) { // 表示当前源IP在允许的范围内
5757
return true;
5858
}
5959
return false;

memcloud-dns/src/main/java/io/memcloud/memdns/util/MyRestrictJSHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public String fromObject(Object obj, String resultCode, Writer stream) throws IO
4545
public static final String LEVEL_ALLOW_SUB = "sub";
4646
public static final String LEVEL_DENY = "false";
4747

48-
/**
48+
/*
4949
* 可以重新覆盖这个实现
5050
*/
5151
protected String getLevel(String domain) {

0 commit comments

Comments
 (0)