actions = Collections.emptyList();
-
- if (StringUtil.isNotBlank(type)) {
- switch (type) {
- case "threads":
- threads = TaskRunManager.getAllThread();
- break;
- case "schedulers":
- schedulers = QuartzSchedulerManager.getAllScheduler();
- break;
- case "actions":
- actions = TaskRunManager.getAllAction();
- break;
- default:
- throw new ApiException(500, "err type " + type);
- }
-
- } else {
- threads = TaskRunManager.getAllThread();
- schedulers = QuartzSchedulerManager.getAllScheduler();
- actions = TaskRunManager.getAllAction();
- }
-
- final String gn = groupName;
- if (StringUtil.isNotBlank(groupName)) {
- threads = threads.stream().filter(t -> t.getGroupName().equals(gn)).collect(Collectors.toList());
- schedulers = schedulers.stream().filter(t -> t.getGroupName().equals(gn)).collect(Collectors.toList());
- actions = actions.stream().filter(t -> t.getGroupName().equals(gn)).collect(Collectors.toList());
- }
-
- JSONObject json = new JSONObject();
-
- json.put("threads", threads);
- json.put("schedulers", schedulers);
- json.put("actions", actions);
-
- return Restful.ok().obj(json);
- }
- }
-
- /**
- * 停止一个运行的action
- *
- * 停止一个运行的action，或者task
- */
- @At
- public Restful stop(@Param("hostPort") String hostPort, @Param("key") String key, @Param(value = "first", df = "true") boolean first) throws Exception {
- if (first) {
- JSONObject json = new JSONObject();
- Map post = proxyService.post(new String[]{hostPort}, "/admin/thread/stop", ImmutableMap.of("key", key, "first", false), 100000);
- for (Map.Entry entry : post.entrySet()) {
- Restful ref = entry.getValue();
- if (!ref.isOk()) {
- LOG.error(entry.getKey() + ":" + entry.getValue().toJsonString());
- continue;
- }
- return Restful.instance(ref.isOk(),ref.getMessage()) ;
- }
- } else {
- try {
- TaskRunManager.stop(key);
- return Restful.ok().msg("停止任务成功！");
- } catch (TaskException e) {
- e.printStackTrace();
- LOG.error("stop action err", e);
- return Restful.fail().msg("停止任务失败！");
- }
- }
- return null;
- }
-
-// /**
-// * 停止一个运行的job的所有实例线程
-// */
-// @At
-// public void stopAllJob(String groupName, String taskName) throws Exception {
-// try {
-// TaskRunManager.stopAll(groupName, taskName);
-// } catch (Exception e) {
-// LOG.error("author err", e);
-// throw e;
-// }
-// }
-}
+package org.nlpcn.jcoder.controller;
+
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.nlpcn.jcoder.domain.Task;
+import org.nlpcn.jcoder.domain.TaskInfo;
+import org.nlpcn.jcoder.domain.UserGroup;
+import org.nlpcn.jcoder.scheduler.TaskException;
+import org.nlpcn.jcoder.scheduler.ThreadManager;
+import org.nlpcn.jcoder.service.TaskService;
+import org.nlpcn.jcoder.util.StaticValue;
+import org.nlpcn.jcoder.util.dao.BasicDao;
+import org.nutz.dao.Cnd;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.Mvcs;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.By;
+import org.nutz.mvc.annotation.Filters;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.filter.CheckSession;
+import org.quartz.SchedulerException;
+
+import com.alibaba.fastjson.JSONObject;
+
+@IocBean
+public class ThreadAction {
+
+ private static final Logger LOG = Logger.getLogger(ThreadAction.class);
+
+ private BasicDao basicDao = StaticValue.systemDao;
+
+ @Filters(@By(type = CheckSession.class, args = { "user", "/login.jsp" }))
+ @At("/thread/list/")
+ @Ok("jsp:/thread_list.jsp")
+ public JSONObject list() throws TaskException, NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException, SchedulerException {
+ return this.runInfo();
+ }
+
+ /**
+ * 通过api的方式获得线程
+ *
+ * @return
+ * @throws SchedulerException
+ * @throws TaskException
+ */
+ @At("/thread/info")
+ @Ok("json")
+ public JSONObject runInfo() throws SchedulerException, TaskException {
+ // 线程任务
+ List threads = ThreadManager.getAllThread();
+
+ // 获得计划任务
+ List schedulers = ThreadManager.getAllScheduler();
+
+ // 获得执行中的action
+ List actions = ThreadManager.getAllAction();
+
+ JSONObject json = new JSONObject();
+
+ json.put("threads", threads);
+
+ json.put("schedulers", schedulers);
+
+ json.put("actions", actions);
+
+ return json;
+ }
+
+ @Filters(@By(type = CheckSession.class, args = { "user", "/login.jsp" }))
+ @At("/thread/stop/task/?")
+ @Ok("redirect:/thread/list/")
+ public void stopTask(String name) throws Exception {
+ try {
+ authEditorValidate(name);
+ try {
+ ThreadManager.stop(name);
+ } catch (TaskException e) {
+ e.printStackTrace();
+ LOG.error(e);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ LOG.error(e);
+ }
+ }
+
+
+ /**
+ * 停止一个运行的action
+ *
+ * @param host
+ * @param name
+ * @throws Exception
+ */
+ @Filters(@By(type = CheckSession.class, args = { "user", "/login.jsp" }))
+ @At("/thread/stop/?")
+ @Ok("redirect:/thread/list/")
+ public void stop(String key) throws Exception {
+ try {
+ authEditorValidate(key.split("@")[0]);
+ try {
+ ThreadManager.stop(key);
+ } catch (TaskException e) {
+ e.printStackTrace();
+ LOG.error(e);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ LOG.error(e);
+ }
+ }
+
+ /**
+ * 编辑task权限验证
+ *
+ * @throws Exception
+ */
+ private void authEditorValidate(String name) throws Exception {
+ if ((Integer) Mvcs.getHttpSession().getAttribute("userType") == 1) {
+ return;
+ }
+
+ Task task = TaskService.findTaskByCache(name);
+
+ UserGroup ug = basicDao.findByCondition(UserGroup.class, Cnd.where("groupId", "=", task.getGroupId()).and("userId", "=", Mvcs.getHttpSession().getAttribute("userId")));
+ if (ug == null || ug.getAuth() != 2) {
+ throw new Exception("not have editor auth in groupId:" + task.getGroupId());
+ }
+ }
+
+}
diff --git a/src/main/java/org/nlpcn/jcoder/controller/UserAction.java b/src/main/java/org/nlpcn/jcoder/controller/UserAction.java
index c8c4945..996da98 100644
--- a/src/main/java/org/nlpcn/jcoder/controller/UserAction.java
+++ b/src/main/java/org/nlpcn/jcoder/controller/UserAction.java
@@ -1,117 +1,195 @@
-package org.nlpcn.jcoder.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import org.nlpcn.jcoder.domain.Group;
-import org.nlpcn.jcoder.domain.User;
-import org.nlpcn.jcoder.filter.AuthoritiesManager;
-import org.nlpcn.jcoder.util.Restful;
-import org.nlpcn.jcoder.util.StaticValue;
-import org.nlpcn.jcoder.util.dao.BasicDao;
-import org.nutz.dao.Cnd;
-import org.nutz.dao.Condition;
-import org.nutz.ioc.loader.annotation.IocBean;
-import org.nutz.mvc.annotation.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Date;
-import java.util.List;
-
-@IocBean
-@Filters(@By(type = AuthoritiesManager.class))
-@Ok("json")
-public class UserAction {
-
- private static final Logger LOG = LoggerFactory.getLogger(UserAction.class);
-
-
- public BasicDao basicDao = StaticValue.systemDao;
- ;
-
- @At("/admin/user/list")
- public Restful userList() {
-
- JSONObject result = new JSONObject();
-
- Condition con = null;
- List users = basicDao.search(User.class, con);
- result.put("users", users);
-
- List groups = basicDao.search(Group.class, con);
- result.put("groups", groups);
-
- return Restful.instance().obj(result);
-
- }
-
- @At("/user/nameDiff")
- @Ok("raw")
- public boolean userNameDiff(@Param("name") String name) {
- Condition con = Cnd.where("name", "=", name);
- int count = basicDao.searchCount(User.class, con);
- return count == 0;
- }
-
-
- @At("/admin/user/add")
- public Restful addU(@Param("..") User user) throws Exception {
- //User user = JSONObject.parseObject(userInfo).toJavaObject(User.class);
- if (userNameDiff(user.getName())) {
- user.setPassword(StaticValue.passwordEncoding(user.getPassword()));
- user.setCreateTime(new Date());
- basicDao.save(user);
- LOG.info("add user:" + user.getName());
- return Restful.ok().msg("添加成功！");
- } else {
- return Restful.fail().msg("有相同名字用户！");
- }
-
- }
-
- @At("/admin/user/del")
- public Restful delU(@Param("..") User user) {
- // TODO 删除用户后要把用户相关的userTask及userGroup删除，等userTask完成后做
- if (user.getType() == 1) {
- // 保证至少要有一个超级用户
- Condition con = Cnd.where("type", "=", 1);
- int count = basicDao.searchCount(User.class, con);
- if (count == 1) {
- LOG.info("fail to del the last super user!");
- return Restful.fail().msg("至少保证有一个超级管理员！");
- }
- }
- boolean flag = basicDao.delById(user.getId(), User.class);
- if (flag) {
- LOG.info("del user:" + user.getName());
- return Restful.ok().msg("删除用户：" + user.getName() + "成功！");
- }
- Condition co = Cnd.where("userId", "=", user.getId());
- /*int num = basicDao.delByCondition(UserGroup.class, co);
- if (num > 0) {
- LOG.info("del userGroup's num:" + num);
- }*/
- return Restful.ok();
- }
-
- @At("/admin/user/modify")
- public Restful modify(@Param("..") User user) throws Exception {
- if (user == null) {
- return Restful.fail().msg("修改失败！");
- }
-
- User dbUser = basicDao.find(user.getId(), User.class);
-
- if (!user.getPassword().equals(dbUser.getPassword())) {
- user.setPassword(StaticValue.passwordEncoding(user.getPassword()));
- }
-
- boolean flag = basicDao.update(user);
- if (flag) {
- LOG.info("modify user:" + user);
- return Restful.ok().msg("修改成功！");
- }
- return Restful.ok();
- }
-
-
-}
+package org.nlpcn.jcoder.controller;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.nlpcn.jcoder.domain.Group;
+import org.nlpcn.jcoder.domain.User;
+import org.nlpcn.jcoder.domain.UserGroup;
+import org.nlpcn.jcoder.filter.AuthoritiesManager;
+import org.nlpcn.jcoder.util.StaticValue;
+import org.nlpcn.jcoder.util.dao.BasicDao;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Condition;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.Mvcs;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.By;
+import org.nutz.mvc.annotation.Fail;
+import org.nutz.mvc.annotation.Filters;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+@IocBean
+@Filters(@By(type = AuthoritiesManager.class, args = { "userType", "1", "/login.jsp" }))
+public class UserAction {
+
+ private Logger log = Logger.getLogger(this.getClass());
+
+ public BasicDao basicDao = StaticValue.systemDao;;
+
+ @At("/user/list")
+ @Ok("jsp:/user/user_list.jsp")
+ public void userList() {
+ Condition con = null;
+ List users = basicDao.search(User.class, con);
+ Mvcs.getReq().setAttribute("users", users);
+
+ List groups = basicDao.search(Group.class, con);
+ Mvcs.getReq().setAttribute("groups", groups);
+
+ }
+
+ @At("/group/list")
+ @Ok("jsp:/user/group_list.jsp")
+ public void groupList() {
+ Condition con = null;
+ List groups = basicDao.search(Group.class, con);
+ // 查找group下所有用户
+
+ for (Group group : groups) {
+ List userGroupList = basicDao.search(UserGroup.class, Cnd.where("groupId", "=", group.getId()));
+
+ List> users = new ArrayList<>();
+ for (UserGroup userGroup : userGroupList) {
+ Map userInfo = new HashMap<>();
+ User user = basicDao.find(userGroup.getUserId(), User.class);
+ if (user == null) {
+ continue;
+ }
+ userInfo.put("id", user.getId());
+ userInfo.put("createTime", userGroup.getCreateTime());
+ userInfo.put("auth", userGroup.getAuth());
+ userInfo.put("name", user.getName());
+ users.add(userInfo);
+ }
+
+ group.setUsers(users);
+ }
+ Mvcs.getReq().setAttribute("groups", groups);
+ }
+
+ @At("/user/nameDiff")
+ @Ok("raw")
+ public boolean userNameDiff(@Param("name") String name) {
+ Condition con = Cnd.where("name", "=", name);
+ int count = basicDao.searchCount(User.class, con);
+ return count == 0;
+ }
+
+ @At("/group/nameDiff")
+ @Ok("raw")
+ public boolean groupNameDiff(@Param("name") String name) {
+ Condition con = Cnd.where("name", "=", name);
+ int count = basicDao.searchCount(Group.class, con);
+ return count == 0;
+ }
+
+ @At("/user/add")
+ @Ok("redirect:/user/list")
+ @Fail("jsp:/fail.jsp")
+ public void addU(@Param("..") User user) throws Exception {
+ if (userNameDiff(user.getName())) {
+ user.setPassword(StaticValue.passwordEncoding(user.getPassword()));
+ user.setCreateTime(new Date());
+ basicDao.save(user);
+ log.info("add user:" + user.getName());
+ }
+ }
+
+ @At("/user/del")
+ @Ok("redirect:/user/list")
+ public void delU(@Param("..") User user) {
+ // TODO 删除用户后要把用户相关的userTask及userGroup删除，等userTask完成后做
+ if (user.getType() == 1) {
+ // 保证至少要有一个超级用户
+ Condition con = Cnd.where("type", "=", 1);
+ int count = basicDao.searchCount(User.class, con);
+ if (count == 1) {
+ log.info("fail to del the last super user!");
+ return;
+ }
+ }
+ boolean flag = basicDao.delById(user.getId(), User.class);
+ if (flag) {
+ log.info("del user:" + user.getName());
+ }
+ Condition co = Cnd.where("userId", "=", user.getId());
+ int num = basicDao.delByCondition(UserGroup.class, co);
+ if (num > 0) {
+ log.info("del userGroup's num:" + num);
+ }
+ }
+
+ @At("/user/modify")
+ @Ok("redirect:/user/list")
+ @Fail("jsp:/fail.jsp")
+ public void modify(@Param("..") User user) throws Exception {
+ if (user == null) {
+ return;
+ }
+
+ User dbUser = basicDao.find(user.getId(), User.class);
+
+ if (!user.getPassword().equals(dbUser.getPassword())) {
+ user.setPassword(StaticValue.passwordEncoding(user.getPassword()));
+ }
+
+ boolean flag = basicDao.update(user);
+ if (flag) {
+ log.info("modify user:" + user);
+ }
+ }
+
+ @At("/group/add")
+ @Ok("redirect:/group/list")
+ @Fail("jsp:/fail.jsp")
+ public void addG(@Param("..") Group group) throws Exception {
+ if (groupNameDiff(group.getName())) {
+ group.setCreateTime(new Date());
+ basicDao.save(group);
+ log.info("add group:" + group.getName());
+ List groups = (List) Mvcs.getHttpSession().getAttribute("GROUP_LIST");
+ groups.add(group);
+ Mvcs.getHttpSession().setAttribute("GROUP_LIST", groups);
+ }
+ }
+
+ @At("/group/del")
+ @Ok("redirect:/group/list")
+ public void delG(@Param("..") Group group) {
+ basicDao.delById(group.getId(), Group.class);
+ log.info("del group:" + group.getName());
+ Condition con = Cnd.where("groupId", "=", group.getId());
+ int num = basicDao.delByCondition(UserGroup.class, con);
+ List groups = (List) Mvcs.getHttpSession().getAttribute("GROUP_LIST");
+ Iterator it = groups.iterator();
+ while (it.hasNext()) {
+ Group g = it.next();
+ if (g.getId() == group.getId()) {
+ it.remove();
+ }
+ }
+ Mvcs.getHttpSession().setAttribute("GROUP_LIST", groups);
+ log.info("del userGroup's num:" + num);
+ }
+
+ @At("/group/modify")
+ @Ok("redirect:/group/list")
+ @Fail("jsp:/fail.jsp")
+ public void modifyG(@Param("..") Group group) throws Exception {
+ if (group == null) {
+ return;
+ }
+ boolean flag = basicDao.update(group);
+ if (flag) {
+ log.info("modify group:" + group.toString());
+ }
+ }
+
+}
diff --git a/src/main/java/org/nlpcn/jcoder/domain/ApiDoc.java b/src/main/java/org/nlpcn/jcoder/domain/ApiDoc.java
index 7796e1c..22fa066 100644
--- a/src/main/java/org/nlpcn/jcoder/domain/ApiDoc.java
+++ b/src/main/java/org/nlpcn/jcoder/domain/ApiDoc.java
@@ -6,10 +6,10 @@
public abstract class ApiDoc {
- protected List sub;
- protected Map attr;
private String name;
private String content;
+ protected List sub;
+ protected Map attr;
public ApiDoc(String name) {
this.name = name;
diff --git a/src/main/java/org/nlpcn/jcoder/domain/ClassDoc.java b/src/main/java/org/nlpcn/jcoder/domain/ClassDoc.java
index 70a5ed2..805496c 100644
--- a/src/main/java/org/nlpcn/jcoder/domain/ClassDoc.java
+++ b/src/main/java/org/nlpcn/jcoder/domain/ClassDoc.java
@@ -1,175 +1,153 @@
-package org.nlpcn.jcoder.domain;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * api 的信息类
- *
- * @author ansj
- */
-
-public class ClassDoc extends ApiDoc {
-
- private String group;
- private boolean single = true;
- private boolean status = true;
- private String scheduleStr ;
- private String version;
- private String description;
-
- public ClassDoc(String name) {
- super(name);
- }
-
- public String getGroup() {
- return group;
- }
-
- public void setGroup(String group) {
- this.group = group;
- }
-
- public boolean isSingle() {
- return single;
- }
-
- public void setSingle(boolean single) {
- this.single = single;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public boolean isStatus() {
- return status;
- }
-
- public void setStatus(boolean status) {
- this.status = status;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getScheduleStr() {
- return scheduleStr;
- }
-
- public void setScheduleStr(String scheduleStr) {
- this.scheduleStr = scheduleStr;
- }
-
- @Override
- public ApiDoc createSubDoc(String name) {
- MethodDoc methodDoc = new MethodDoc(name);
- if (sub == null) {
- sub = new ArrayList<>();
- }
- sub.add(methodDoc);
- return methodDoc;
- }
-
- public class MethodDoc extends ApiDoc {
- private boolean defaultExecute;
- private String returnContent;
- private Set methods = new HashSet<>();
-
- public MethodDoc(String name) {
- super(name);
- }
-
- public boolean isDefaultExecute() {
- return defaultExecute;
- }
-
- public void setDefaultExecute(boolean defaultExecute) {
- this.defaultExecute = defaultExecute;
- }
-
- public String getReturnContent() {
- return returnContent;
- }
-
- public void setReturnContent(String returnContent) {
- this.returnContent = returnContent;
- }
-
- public Set getMethods() {
- return methods;
- }
-
- public void setMethods(Set methods) {
- this.methods = methods;
- }
-
- public void addMethod(String method) {
- methods.add(method);
- }
-
- @Override
- public ApiDoc createSubDoc(String name) {
- ParamDoc paramDoc = new ParamDoc(name);
- if (sub == null) {
- sub = new ArrayList<>();
- }
- sub.add(paramDoc);
- return paramDoc;
- }
-
- public class ParamDoc extends ApiDoc {
-
- private String fieldName;
-
- private String type;
-
- private boolean required;
-
- public ParamDoc(String name) {
- super(name);
- }
-
- public String getFieldName() {
- return fieldName;
- }
-
- public void setFieldName(String fieldName) {
- this.fieldName = fieldName;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public boolean isRequired() {
- return required;
- }
-
- public void setRequired(boolean required) {
- this.required = required;
- }
-
- @Override
- public ApiDoc createSubDoc(String name) {
- return null;
- }
- }
- }
-
-}
-
+package org.nlpcn.jcoder.domain;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * api 的信息类
+ *
+ * @author ansj
+ *
+ */
+
+public class ClassDoc extends ApiDoc {
+
+ public ClassDoc(String name) {
+ super(name);
+ }
+
+ private boolean single = true;
+
+ private boolean status = true;
+
+ private String version ;
+
+ private String description;
+
+ public boolean isSingle() {
+ return single;
+ }
+
+ public void setSingle(boolean single) {
+ this.single = single;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public boolean isStatus() {
+ return status;
+ }
+
+ public void setStatus(boolean status) {
+ this.status = status;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public class MethodDoc extends ApiDoc {
+ public MethodDoc(String name) {
+ super(name);
+ }
+
+ private boolean defaultExecute;
+
+ private String retrunContent;
+
+ private Set methods = new HashSet<>();
+
+ public boolean isDefaultExecute() {
+ return defaultExecute;
+ }
+
+ public void setDefaultExecute(boolean defaultExecute) {
+ this.defaultExecute = defaultExecute;
+ }
+
+ public String getRetrunContent() {
+ return retrunContent;
+ }
+
+ public void setRetrunContent(String retrunContent) {
+ this.retrunContent = retrunContent;
+ }
+
+ public Set getMethods() {
+ return methods;
+ }
+
+ public void setMethods(Set methods) {
+ this.methods = methods;
+ }
+
+ public void addMethod(String method) {
+ methods.add(method);
+ }
+
+ public class ParamDoc extends ApiDoc {
+
+ private String fieldName;
+
+ private String type;
+
+ public ParamDoc(String name) {
+ super(name);
+ }
+
+ public String getFieldName() {
+ return fieldName;
+ }
+
+ public void setFieldName(String fieldName) {
+ this.fieldName = fieldName;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ @Override
+ public ApiDoc createSubDoc(String name) {
+ return null;
+ }
+ }
+
+ @Override
+ public ApiDoc createSubDoc(String name) {
+ ParamDoc paramDoc = new ParamDoc(name);
+ if (sub == null) {
+ sub = new ArrayList<>();
+ }
+ sub.add(paramDoc);
+ return paramDoc;
+ }
+ }
+
+ @Override
+ public ApiDoc createSubDoc(String name) {
+ MethodDoc methodDoc = new MethodDoc(name);
+ if (sub == null) {
+ sub = new ArrayList<>();
+ }
+ sub.add(methodDoc);
+ return methodDoc;
+ }
+
+}
+
diff --git a/src/main/java/org/nlpcn/jcoder/domain/CodeInfo.java b/src/main/java/org/nlpcn/jcoder/domain/CodeInfo.java
index 2947ccc..337ecfd 100644
--- a/src/main/java/org/nlpcn/jcoder/domain/CodeInfo.java
+++ b/src/main/java/org/nlpcn/jcoder/domain/CodeInfo.java
@@ -1,175 +1,179 @@
-package org.nlpcn.jcoder.domain;
-
-import org.nlpcn.jcoder.run.CodeRuntimeException;
-import org.nlpcn.jcoder.service.JarService;
-import org.nutz.ioc.Ioc;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Method;
-import java.util.*;
-
-/**
- * the code init info
- *
- * @author ansj
- */
-public class CodeInfo {
-
- private static final Logger LOG = LoggerFactory.getLogger(CodeInfo.class);
-
- private Class classz;
-
- private Object JavaObject;
-
- private Map executeMethods = new HashMap<>();
-
- private ExecuteMethod defaultMethod;
-
- private Ioc ioc;
-
- private ClassLoader classLoader;
-
- private boolean single = true;
-
- public boolean iocChanged(String groupName) {
- return this.ioc != JarService.getOrCreate(groupName).getIoc();
- }
-
- public Ioc getIoc() {
- return ioc;
- }
-
- public boolean classLoaderChanged(String groupName) {
- return this.classLoader != JarService.getOrCreate(groupName).getEngine().getClassLoader();
- }
-
- public void setioc(Ioc ioc) {
- this.ioc = ioc;
- }
-
- public ClassLoader getClassLoader() {
- return this.classLoader;
- }
-
- public void setClassLoader(ClassLoader classLoader) {
- this.classLoader = classLoader;
- }
-
- public Class getClassz() {
- return classz;
- }
-
- public void setClassz(Class classz) {
- this.classz = classz;
- }
-
- public Object getJavaObject() {
- return JavaObject;
- }
-
- public void setJavaObject(Object javaObject) {
- JavaObject = javaObject;
- }
-
- public Collection getExecuteMethods() {
- return executeMethods.values();
- }
-
- public boolean isSingle() {
- return single;
- }
-
- public void setSingle(boolean single) {
- this.single = single;
- }
-
- public void addMethod(ExecuteMethod method) {
- if (defaultMethod == null) {
- defaultMethod = method;
- }
- this.executeMethods.put(method.getName(), method);
- }
-
- public void addMethod(Method method, Set methodTypeSet, boolean rpc, boolean restful) {
- addMethod(new ExecuteMethod(method, methodTypeSet, rpc, restful));
- }
-
- public ExecuteMethod getDefaultMethod() {
- if (defaultMethod == null) {
- if (executeMethods.size() == 0) {
- throw new CodeRuntimeException(classz.getName() + " not have any @Execute annotation you must set one ");
- }
- defaultMethod = executeMethods.entrySet().iterator().next().getValue();
- }
- return defaultMethod;
- }
-
- /**
- * 通过方法名称获得方法
- *
- * @param methodName
- * @return
- */
- public ExecuteMethod getExecuteMethod(String methodName) {
- return executeMethods.get(methodName);
- }
-
- /**
- * 执行方法的抽象类
- *
- * @author Ansj
- */
- public class ExecuteMethod {
- private Method method;
- private Set methodTypeSet = new HashSet<>();
- private boolean rpc;
- private boolean restful;
-
- public ExecuteMethod(Method method, Set methodTypeSet, boolean rpc, boolean restful) {
- super();
- this.method = method;
- this.methodTypeSet = methodTypeSet;
- this.rpc = rpc;
- this.restful = restful;
- }
-
- public Method getMethod() {
- return method;
- }
-
- public void setMethod(Method method) {
- this.method = method;
- }
-
- public Set getMethodTypeSet() {
- return methodTypeSet;
- }
-
- public void setMethodTypeSet(Set methodTypeSet) {
- this.methodTypeSet = methodTypeSet;
- }
-
- public boolean isRpc() {
- return rpc;
- }
-
- public void setRpc(boolean rpc) {
- this.rpc = rpc;
- }
-
- public boolean isRestful() {
- return restful;
- }
-
- public void setRestful(boolean restful) {
- this.restful = restful;
- }
-
- public String getName() {
- return this.method.getName();
- }
-
- }
-
-}
+package org.nlpcn.jcoder.domain;
+
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+import org.nlpcn.jcoder.run.CodeRuntimeException;
+import org.nlpcn.jcoder.run.java.DynamicEngine;
+import org.nlpcn.jcoder.util.StaticValue;
+import org.nutz.ioc.Ioc;
+
+/**
+ * the code init info
+ *
+ * @author ansj
+ *
+ */
+public class CodeInfo {
+
+ private static final Logger LOG = Logger.getLogger(CodeInfo.class);
+
+ private Class classz;
+
+ private Object JavaObject;
+
+ private Map executeMethods = new HashMap<>();
+
+ private ExecuteMethod defaultMethod;
+
+ private Ioc ioc;
+
+ private ClassLoader classLoader;
+
+ private boolean single = true;
+
+ public boolean iocChanged() {
+ return this.ioc != StaticValue.getUserIoc();
+ }
+
+ public boolean classLoaderChanged() {
+ return this.classLoader != DynamicEngine.getInstance().getParentClassLoader();
+ }
+
+ public void setioc(Ioc ioc) {
+ this.ioc = ioc;
+ }
+
+ public void setClassLoader(ClassLoader classLoader) {
+ this.classLoader = classLoader;
+ }
+
+ public Class getClassz() {
+ return classz;
+ }
+
+ public void setClassz(Class classz) {
+ this.classz = classz;
+ }
+
+ public Object getJavaObject() {
+ return JavaObject;
+ }
+
+ public void setJavaObject(Object javaObject) {
+ JavaObject = javaObject;
+ }
+
+ public Collection getExecuteMethods() {
+ return executeMethods.values();
+ }
+
+ public void setDefaultMethod(Method method, Set methodTypeSet, boolean rpc, boolean restful) {
+ if (defaultMethod == null) {
+ this.defaultMethod = new ExecuteMethod(method, methodTypeSet, rpc, restful);
+ } else {
+ LOG.warn(classz.getName() + " has being more than one @DefaultExecute annotation method : " + defaultMethod.getName() + " so skip method : " + method.getName());
+ }
+ addMethod(defaultMethod);
+ }
+
+ public boolean isSingle() {
+ return single;
+ }
+
+ public void setSingle(boolean single) {
+ this.single = single;
+ }
+
+ public void addMethod(ExecuteMethod method) {
+ this.executeMethods.put(method.getName(), method);
+ }
+
+ public void addMethod(Method method, Set methodTypeSet, boolean rpc, boolean restful) {
+ addMethod(new ExecuteMethod(method, methodTypeSet, rpc, restful));
+ }
+
+ public ExecuteMethod getDefaultMethod() {
+ if (defaultMethod == null) {
+ if (executeMethods.size() == 0) {
+ throw new CodeRuntimeException(classz.getName() + " not have any @Execute or @DefaultExecute annotation you must set one ");
+ }
+ defaultMethod = executeMethods.entrySet().iterator().next().getValue();
+ LOG.warn(defaultMethod.getMethod().getDeclaringClass().getName() + " none @DefaultExecute annotation method : so set the firest method to DefaultExecute function:"
+ + defaultMethod.getName());
+ }
+ return defaultMethod;
+ }
+
+ /**
+ * 通过方法名称获得方法
+ * @param methodName
+ * @return
+ */
+ public ExecuteMethod getExecuteMethod(String methodName) {
+ return executeMethods.get(methodName);
+ }
+
+ /**
+ * 执行方法的抽象类
+ * @author Ansj
+ *
+ */
+ public class ExecuteMethod {
+ private Method method;
+ private Set methodTypeSet = new HashSet<>();
+ private boolean rpc;
+ private boolean restful;
+
+ public ExecuteMethod(Method method, Set methodTypeSet, boolean rpc, boolean restful) {
+ super();
+ this.method = method;
+ this.methodTypeSet = methodTypeSet;
+ this.rpc = rpc;
+ this.restful = restful;
+ }
+
+ public Method getMethod() {
+ return method;
+ }
+
+ public void setMethod(Method method) {
+ this.method = method;
+ }
+
+ public Set getMethodTypeSet() {
+ return methodTypeSet;
+ }
+
+ public void setMethodTypeSet(Set methodTypeSet) {
+ this.methodTypeSet = methodTypeSet;
+ }
+
+ public boolean isRpc() {
+ return rpc;
+ }
+
+ public void setRpc(boolean rpc) {
+ this.rpc = rpc;
+ }
+
+ public boolean isRestful() {
+ return restful;
+ }
+
+ public void setRestful(boolean restful) {
+ this.restful = restful;
+ }
+
+ public String getName() {
+ return this.method.getName();
+ }
+
+ }
+
+}
diff --git a/src/main/java/org/nlpcn/jcoder/domain/Different.java b/src/main/java/org/nlpcn/jcoder/domain/Different.java
deleted file mode 100644
index ce34668..0000000
--- a/src/main/java/org/nlpcn/jcoder/domain/Different.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.nlpcn.jcoder.domain;
-
-import java.io.Serializable;
-
-/**
- * 解决冲突的操作
- */
-public class Different implements Serializable {
-
- private String groupName;
- private String path;
- private Integer type;//0 task , 1.file
- private String message;
-
- public String getGroupName() {
- return groupName;
- }
-
- public void setGroupName(String groupName) {
- this.groupName = groupName;
- }
-
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
-
- public String getMessage() {
- return message;
- }
-
- public void addMessage(String message) {
- if (this.message == null) {
- this.message = message;
- } else {
- this.message = this.message + "\t" + message;
- }
- }
-
- @Override
- public String toString() {
- return "Different{" +
- "groupName='" + groupName + '\'' +
- ", path='" + path + '\'' +
- ", type=" + type +
- ", message='" + message + '\'' +
- '}';
- }
-}
diff --git a/src/main/java/org/nlpcn/jcoder/domain/FileInfo.java b/src/main/java/org/nlpcn/jcoder/domain/FileInfo.java
index 1fe683b..6633b93 100644
--- a/src/main/java/org/nlpcn/jcoder/domain/FileInfo.java
+++ b/src/main/java/org/nlpcn/jcoder/domain/FileInfo.java
@@ -1,144 +1,66 @@
-package org.nlpcn.jcoder.domain;
-
-import com.google.common.base.Objects;
-
-import org.nlpcn.jcoder.service.FileInfoService;
-import org.nlpcn.jcoder.util.StaticValue;
-
-import java.io.File;
-import java.io.Serializable;
-
-/**
- * 文件信息的包装类
- */
-public class FileInfo implements Comparable, Serializable {
-
- private File file;
-
- private String name;
-
- private String md5;
-
- private boolean directory;
-
- private String relativePath;
-
- private long length;
-
- private String groupName;
-
- private long lastModified;
-
- private FileInfo() {
- }
-
- /**
- * 从git创建文件
- */
- public FileInfo(File file) {
- this.file = file;
- this.directory = file.isDirectory();
- this.name = file.getName();
- String groupPath = null;
- groupPath = file.toURI().toString().replaceFirst(new File(StaticValue.HOME_FILE, "group").toURI().toString(), "/");
- this.groupName = groupPath.split("/")[1];
- this.relativePath = groupPath.substring(groupName.length() + 1);
- if (this.relativePath.endsWith("/")) {
- this.relativePath = this.relativePath.substring(0, this.relativePath.length() - 1);
- }
- this.length = file.length();
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public File file() {
- return file;
- }
-
- public void setFile(File file) {
- this.file = file;
- }
-
- public synchronized String getMd5() {
- if (this.md5 == null) {
- md5 = FileInfoService.computerMD5(this);
- }
- return md5;
- }
-
- public void setMd5(String md5) {
- this.md5 = md5;
- }
-
- public boolean isDirectory() {
- return directory;
- }
-
- public void setDirectory(boolean directory) {
- this.directory = directory;
- }
-
- public String getRelativePath() {
- return relativePath;
- }
-
- public void setRelativePath(String relativePath) {
- this.relativePath = relativePath;
- }
-
- public long getLength() {
- return length;
- }
-
- public void setLength(long length) {
- this.length = length;
- }
-
- public long getLastModified() {
- if (this.lastModified == 0 && file != null) {
- this.lastModified = file.lastModified();
- }
- return lastModified;
- }
-
- public void setLastModified(long lastModified) {
- this.lastModified = lastModified;
- }
-
- public String getGroupName() {
- return groupName;
- }
-
- public void setGroupName(String groupName) {
- this.groupName = groupName;
- }
-
- @Override
- public int compareTo(FileInfo ji) {
- return (this.getRelativePath().compareTo(ji.getRelativePath()));
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- FileInfo fileInfo = (FileInfo) o;
- if (this.length != fileInfo.length) return false;
- if (this.groupName != null ? this.name.equals(fileInfo.groupName) : fileInfo.groupName == null)
- return false;
- if (this.getLastModified() != fileInfo.getLastModified()) return false;
- return relativePath != null ? relativePath.equals(fileInfo.relativePath) : fileInfo.relativePath == null;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(groupName, relativePath, getLastModified(), length);
- }
-
-}
+package org.nlpcn.jcoder.domain;
+
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Date;
+
+import org.nlpcn.commons.lang.util.StringUtil;
+
+public class FileInfo implements Comparable {
+
+ private File file;
+
+ private String name;
+
+ public FileInfo(File file) {
+ this.file = file;
+ }
+
+ public FileInfo(File file, String name) {
+ this.file = file;
+ this.name = name;
+ }
+
+ public String getName() {
+ if (StringUtil.isBlank(name)) {
+ return file.getName();
+ }
+ return name;
+ }
+
+ public File getFile() {
+ return file;
+ }
+
+ public void setFile(File file) {
+ this.file = file;
+ }
+
+ public String getEncodingPath() throws UnsupportedEncodingException {
+ return URLEncoder.encode(file.getAbsolutePath(), "utf-8");
+ }
+
+ @Override
+ public int hashCode() {
+ return this.file.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj instanceof JarInfo) {
+ return this.file.getAbsolutePath().equals(((JarInfo) obj).getFile().getAbsolutePath());
+ } else {
+ return false;
+ }
+ }
+
+ public Date getDate() {
+ return new Date(file.lastModified());
+ }
+
+ @Override
+ public int compareTo(FileInfo ji) {
+ return (this.file.getAbsolutePath().compareTo(ji.file.getAbsolutePath()));
+ }
+}
diff --git a/src/main/java/org/nlpcn/jcoder/domain/Group.java b/src/main/java/org/nlpcn/jcoder/domain/Group.java
index 7de7799..afdfb64 100644
--- a/src/main/java/org/nlpcn/jcoder/domain/Group.java
+++ b/src/main/java/org/nlpcn/jcoder/domain/Group.java
@@ -1,114 +1,76 @@
-package org.nlpcn.jcoder.domain;
-
-import org.nutz.dao.entity.annotation.Column;
-import org.nutz.dao.entity.annotation.Id;
-import org.nutz.dao.entity.annotation.Table;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-@Table("groups")
-public class Group {
-
- @Id
- private Long id;
-
- @Column
- private String name;
-
- @Column
- private String description;
-
- @Column("create_time")
- private Date createTime;
-
- private int fileNum;
-
- private int taskNum;
-
- private long fileLength;
-
- private List hosts;
-
- private List> users;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public int getTaskNum() {
- return taskNum;
- }
-
- public void setTaskNum(int taskNum) {
- this.taskNum = taskNum;
- }
-
- public long getFileLength() {
- return fileLength;
- }
-
- public void setFileLength(long fileLength) {
- this.fileLength = fileLength;
- }
-
- public List getHosts() {
- return hosts;
- }
-
- public void setHosts(List hosts) {
- this.hosts = hosts;
- }
-
- public List> getUsers() {
- return users;
- }
-
- public void setUsers(List> users) {
- this.users = users;
- }
-
- public int getFileNum() {
- return fileNum;
- }
-
- public void setFileNum(int fileNum) {
- this.fileNum = fileNum;
- }
-
-
- @Override
- public String toString() {
- return "Group [id=" + id + ", name=" + name + ", description="
- + description + ", createTime=" + createTime + "]";
- }
-}
+package org.nlpcn.jcoder.domain;
+
+import org.nutz.dao.entity.annotation.Column;
+import org.nutz.dao.entity.annotation.Id;
+import org.nutz.dao.entity.annotation.Table;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Table("groups")
+public class Group {
+
+ @Id
+ private Long id;
+
+ @Column
+ private String name;
+
+ @Column
+ private String description;
+
+ @Column("create_time")
+ private Date createTime;
+
+
+ private List> users;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+
+
+ public List> getUsers() {
+ return users;
+ }
+
+ public void setUsers(List> users) {
+ this.users = users;
+ }
+
+ @Override
+ public String toString() {
+ return "Group [id=" + id + ", name=" + name + ", description="
+ + description + ", createTime=" + createTime + "]";
+ }
+}
diff --git a/src/main/java/org/nlpcn/jcoder/domain/GroupCache.java b/src/main/java/org/nlpcn/jcoder/domain/GroupCache.java
deleted file mode 100644
index 5a6b1b2..0000000
--- a/src/main/java/org/nlpcn/jcoder/domain/GroupCache.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.nlpcn.jcoder.domain;
-
-/**
- * Created by Ansj on 25/12/2017.
- */
-public class GroupCache {
-
- private String timeMD5;
- private String groupMD5;
- private String pomMD5;
-
- public String getTimeMD5() {
- return timeMD5;
- }
-
- public void setTimeMD5(String timeMD5) {
- this.timeMD5 = timeMD5;
- }
-
- public String getGroupMD5() {
- return groupMD5;
- }
-
- public void setGroupMD5(String groupMD5) {
- this.groupMD5 = groupMD5;
- }
-
- public String getPomMD5() {
- return pomMD5;
- }
-
- public void setPomMD5(String pomMD5) {
- this.pomMD5 = pomMD5;
- }
-
-
-}
diff --git a/src/main/java/org/nlpcn/jcoder/domain/GroupGit.java b/src/main/java/org/nlpcn/jcoder/domain/GroupGit.java
deleted file mode 100644
index 4ff9d40..0000000
--- a/src/main/java/org/nlpcn/jcoder/domain/GroupGit.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.nlpcn.jcoder.domain;
-
-import java.util.Date;
-
-public class GroupGit {
-
- private String groupName;
-
- private String uri;
-
- private String userName;
-
- private String password;
-
- private String branch;
-
- private String md5;
-
- /**
- * 多少毫秒pull一次，0不自动
- */
- private int autoPullMillis;
-
-
- private String token;
-
- /**
- * 最后一次pull的时间
- */
- private Date lastPullTime;
-
- public String getGroupName() {
- return groupName;
- }
-
- public void setGroupName(String groupName) {
- this.groupName = groupName;
- }
-
- public String getUri() {
- return uri;
- }
-
- public void setUri(String uri) {
- this.uri = uri;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public int getAutoPullMillis() {
- return autoPullMillis;
- }
-
- public void setAutoPullMillis(int autoPullMillis) {
- this.autoPullMillis = autoPullMillis;
- }
-
- public String getToken() {
- return token;
- }
-
- public void setToken(String token) {
- this.token = token;
- }
-
- public Date getLastPullTime() {
- return lastPullTime;
- }
-
- public void setLastPullTime(Date lastPullTime) {
- this.lastPullTime = lastPullTime;
- }
-
- public String getBranch() {
- return branch;
- }
-
- public void setBranch(String branch) {
- this.branch = branch;
- }
-
- public String getMd5() {
- return md5;
- }
-
- public void setMd5(String md5) {
- this.md5 = md5;
- }
-}
diff --git a/src/main/java/org/nlpcn/jcoder/domain/Handler.java b/src/main/java/org/nlpcn/jcoder/domain/Handler.java
deleted file mode 100644
index 91e965a..0000000
--- a/src/main/java/org/nlpcn/jcoder/domain/Handler.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.nlpcn.jcoder.domain;
-
-
-import org.apache.curator.framework.recipes.cache.TreeCacheEvent.Type;
-
-/**
- * 监听目录的操作
- * Created by Ansj on 03/01/2018.
- */
-public class Handler {
-
- private String groupName;
-
- private String taskName;
-
- private String path;
-
- private Type action;
-
- public Handler(String path, String groupName, String taskName, Type action) {
- this.path = path;
- this.groupName = groupName;
- this.taskName = taskName;
- this.action = action;
- }
-
- public String getGroupName() {
- return groupName;
- }
-
- public void setGroupName(String groupName) {
- this.groupName = groupName;
- }
-
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
- public Type getAction() {
- return action;
- }
-
- public void setAction(Type action) {
- this.action = action;
- }
-
- public String getTaskName() {
- return taskName;
- }
-
- public void setTaskName(String taskName) {
- this.taskName = taskName;
- }
-
- @Override
- public String toString() {
- return "Handler{" +
- "path='" + path + '\'' +
- ", groupName='" + groupName + '\'' +
- ", taskName='" + taskName + '\'' +
- ", action='" + action + '\'' +
- '}';
- }
-}
diff --git a/src/main/java/org/nlpcn/jcoder/domain/HostGroup.java b/src/main/java/org/nlpcn/jcoder/domain/HostGroup.java
deleted file mode 100644
index b4bcede..0000000
--- a/src/main/java/org/nlpcn/jcoder/domain/HostGroup.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.nlpcn.jcoder.domain;
-
-import java.io.Serializable;
-
-/**
- * 主机信息序列化后存放于集群中
- */
-public class HostGroup implements Serializable {
- private int weight;
- private boolean ssl;
- private boolean current;
- private String hostPort;
-
- public int getWeight() {
- return weight;
- }
-
- public void setWeight(int weight) {
- this.weight = weight;
- }
-
- public boolean isSsl() {
- return ssl;
- }
-
- public void setSsl(boolean ssl) {
- this.ssl = ssl;
- }
-
- public boolean isCurrent() {
- return current;
- }
-
- public void setCurrent(boolean current) {
- this.current = current;
- }
-
- public String getHostPort() {
- return hostPort;
- }
-
- public void setHostPort(String hostPort) {
- this.hostPort = hostPort;
- }
-}
diff --git a/src/main/java/org/nlpcn/jcoder/domain/HostGroupWatcher.java b/src/main/java/org/nlpcn/jcoder/domain/HostGroupWatcher.java
deleted file mode 100644
index 47f3e79..0000000
--- a/src/main/java/org/nlpcn/jcoder/domain/HostGroupWatcher.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.nlpcn.jcoder.domain;
-
-import com.alibaba.fastjson.JSONObject;
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
-import org.nlpcn.jcoder.service.SharedSpaceService;
-import org.nlpcn.jcoder.util.StaticValue;
-import org.nlpcn.jcoder.util.ZKMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Created by Ansj on 27/12/2017.
- */
-public class HostGroupWatcher implements Watcher {
-
-
- private static final Logger LOG = LoggerFactory.getLogger(HostGroupWatcher.class);
-
- private HostGroup hostGroup;
-
- private boolean delete = false;
-
- public HostGroupWatcher(HostGroup hostGroup) {
- this.hostGroup = hostGroup;
- }
-
- @Override
- public void process(WatchedEvent event) {
- if (event.getType() == Event.EventType.NodeDataChanged) {
- String key = event.getPath().substring(SharedSpaceService.HOST_GROUP_PATH.length() + 1);
- ZKMap hostGroupCache = StaticValue.space().getHostGroupCache();
- HostGroup hg = hostGroupCache.get(key);
- if (StaticValue.getHostPort().equals(hg.getHostPort())) {
- if (hg != null && hg.getWeight() < 0) {
- this.delete = true;
- hostGroupCache.remove(key);
- } else {
- hostGroup = hg;
- }
- }
- } else if (event.getType() == Event.EventType.NodeDeleted) {
- if (!delete) {
- try {
- String key = event.getPath().substring(SharedSpaceService.HOST_GROUP_PATH.length() + 1);
- String hostPort = key.split("_")[0];
- if (StaticValue.getHostPort().equals(hostPort)) {
- LOG.info("I lost HostGroup so add it again " + event.getPath());
- StaticValue.space().setData2ZKByEphemeral(event.getPath(), JSONObject.toJSONBytes(hostGroup), this);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
- }
-}
diff --git a/src/main/java/org/nlpcn/jcoder/domain/JarInfo.java b/src/main/java/org/nlpcn/jcoder/domain/JarInfo.java
new file mode 100644
index 0000000..cefcc41
--- /dev/null
+++ b/src/main/java/org/nlpcn/jcoder/domain/JarInfo.java
@@ -0,0 +1,27 @@
+package org.nlpcn.jcoder.domain;
+
+import java.io.File;
+
+import org.nlpcn.jcoder.service.JarService;
+
+public class JarInfo extends FileInfo {
+
+ private int status; // 0 加载成功 1 未加载 2 未释放
+
+ public JarInfo(File file, int status) {
+ super(file);
+ this.status = status;
+ }
+
+ public int getStatus() {
+ return status;
+ }
+
+ public void setStatus(int status) {
+ this.status = status;
+ }
+
+ public boolean getIsMavenJar() {
+ return this.getFile().getParentFile().equals(new File(JarService.JAR_PATH + "/target/dependency/"));
+ }
+}
diff --git a/src/main/java/org/nlpcn/jcoder/domain/KeyValue.java b/src/main/java/org/nlpcn/jcoder/domain/KeyValue.java
deleted file mode 100644
index 218666f..0000000
--- a/src/main/java/org/nlpcn/jcoder/domain/KeyValue.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.nlpcn.jcoder.domain;
-
-public class KeyValue {
-
- private K key;
- private V value;
-
- public KeyValue(K key, V value) {
- this.key = key;
- this.value = value;
- }
-
- public static KeyValue with(K key, V value) {
- return new KeyValue<>(key, value);
- }
-
- public K getKey() {
- return this.key;
- }
-
- public V getValue() {
- return this.value;
- }
-
- @Override
- public String toString() {
- if (key == null) {
- return String.valueOf(value);
- } else {
- return key + "=" + value;
- }
- }
-}
diff --git a/src/main/java/org/nlpcn/jcoder/domain/LogInfo.java b/src/main/java/org/nlpcn/jcoder/domain/LogInfo.java
deleted file mode 100644
index b4653f1..0000000
--- a/src/main/java/org/nlpcn/jcoder/domain/LogInfo.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.nlpcn.jcoder.domain;
-
-import org.apache.logging.log4j.core.LogEvent;
-import org.nlpcn.jcoder.run.rpc.Rpcs;
-
-/**
- * Created by Ansj on 06/02/2018.
- */
-public class LogInfo {
-
- private String threadName;
-
- private String groupName;
-
- private String className;
-
- private String methodName;
-
- private String message;
-
- private long time ;
-
- public LogInfo(LogEvent event) {
- this.threadName = event.getThreadName();
- this.groupName = Rpcs.ctx().getGroupName();
- if (groupName != null) {
- this.className = Rpcs.ctx().getClassName();
- this.methodName = Rpcs.ctx().getMethodName();
- }
- this.message = event.getMessage().getFormattedMessage();
- this.time = event.getTimeMillis() ;
- }
-
- public String getThreadName() {
- return threadName;
- }
-
- public void setThreadName(String threadName) {
- this.threadName = threadName;
- }
-
- public String getGroupName() {
- return groupName;
- }
-
- public void setGroupName(String groupName) {
- this.groupName = groupName;
- }
-
- public String getClassName() {
- return className;
- }
-
- public void setClassName(String className) {
- this.className = className;
- }
-
- public String getMethodName() {
- return methodName;
- }
-
- public void setMethodName(String methodName) {
- this.methodName = methodName;
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-
- public long getTime() {
- return time;
- }
-
- public void setTime(long time) {
- this.time = time;
- }
-}
diff --git a/src/main/java/org/nlpcn/jcoder/domain/Task.java b/src/main/java/org/nlpcn/jcoder/domain/Task.java
index 1997d05..38b059d 100644
--- a/src/main/java/org/nlpcn/jcoder/domain/Task.java
+++ b/src/main/java/org/nlpcn/jcoder/domain/Task.java
@@ -1,234 +1,211 @@
-package org.nlpcn.jcoder.domain;
-
-import org.nlpcn.jcoder.run.java.JavaSourceUtil;
-import org.nlpcn.jcoder.service.TaskService;
-import org.nlpcn.jcoder.util.MD5Util;
-import org.nutz.dao.entity.annotation.Column;
-import org.nutz.dao.entity.annotation.Id;
-import org.nutz.dao.entity.annotation.Table;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Date;
-
-@Table("task")
-public class Task {
-
- private static final Logger LOG = LoggerFactory.getLogger(Task.class);
-
- @Id
- private Long id;
-
- @Column
- private String name;
-
- @Column
- private String description;
-
- // while 至少有一台机器保持运行 , all 所有机器都运行，但是只运行一次。 “”字符表示之运行一次之后不在运行
- @Column("schedule_str")
- private String scheduleStr;
-
- @Column
- private String code;
-
- @Column("group_name")
- private String groupName;
-
- @Column("create_user")
- private String createUser;
-
- @Column("update_user")
- private String updateUser;
-
- @Column("create_time")
- private Date createTime;
-
- @Column("update_time")
- private Date updateTime;
-
- @Column("version")
- private String version;
-
- private String runStatus;
-
- private CodeInfo codeInfo = new CodeInfo();
-
- private JavaSourceUtil sourceUtil;
-
- //
- //
- @Column("type")
- private Integer type;
-
- // 任务状态 0,停止 1運行
- @Column("status")
- private Integer status;
-
- private String md5;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- if (code == null) {
- this.md5 = "EMTPY";
- this.name = md5;
- return;
- }
- this.md5 = MD5Util.md5(code);
- try {//抽取名字
- this.sourceUtil = new JavaSourceUtil(code);
- if (name == null) {
- if (this.sourceUtil != null) {
- this.name = sourceUtil.getClassName();
- }
- }
- } catch (Throwable e) {
- LOG.warn("not compile task Name: {}", e.getMessage());
- try {
- this.name = JavaSourceUtil.findClassName(code);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- if (name == null) {
- name = MD5Util.md5(this.code);
- }
- }
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public String getScheduleStr() {
- return scheduleStr;
- }
-
- public void setScheduleStr(String scheduleStr) {
- this.scheduleStr = scheduleStr;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public void setStatus(Integer status) {
- this.status = status;
- }
-
- public String getCreateUser() {
- return createUser;
- }
-
- public void setCreateUser(String createUser) {
- this.createUser = createUser;
- }
-
- public String getUpdateUser() {
- return updateUser;
- }
-
- public void setUpdateUser(String updateUser) {
- this.updateUser = updateUser;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public String getRunStatus() {
- return runStatus;
- }
-
- public void setRunStatus(String runStatus) {
- this.runStatus = runStatus;
- }
-
- public long success() {
- return TaskService.getSuccess(this);
- }
-
- public long error() {
- return TaskService.getError(this);
- }
-
- public void updateError() {
- TaskService.counter(this, false);
- }
-
- public void updateSuccess() {
- TaskService.counter(this, true);
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public CodeInfo codeInfo() {
- return codeInfo;
- }
-
- public String getGroupName() {
- return groupName;
- }
-
- public void setGroupName(String groupName) {
- this.groupName = groupName;
- }
-
- public String getMd5() {
- return md5;
- }
-
- public JavaSourceUtil sourceUtil() {
- return sourceUtil;
- }
-
-}
+package org.nlpcn.jcoder.domain;
+
+import java.util.Date;
+
+import org.nlpcn.commons.lang.util.StringUtil;
+import org.nlpcn.jcoder.run.java.JavaSourceUtil;
+import org.nlpcn.jcoder.util.SharedSpace;
+import org.nutz.dao.entity.annotation.Column;
+import org.nutz.dao.entity.annotation.Id;
+import org.nutz.dao.entity.annotation.Table;
+
+@Table("task")
+public class Task {
+
+ @Id
+ private Long id;
+
+ @Column
+ private String name;
+
+ @Column
+ private String description;
+
+ // while 至少有一台机器保持运行
+ @Column("schedule_str")
+ private String scheduleStr;
+
+ @Column
+ private String code;
+
+ @Column("code_type")
+ private String codeType;
+
+ @Column("group_id")
+ private Long groupId;
+
+ @Column("create_user")
+ private String createUser;
+
+ @Column("update_user")
+ private String updateUser;
+
+ @Column("create_time")
+ private Date createTime;
+
+ @Column("update_time")
+ private Date updateTime;
+
+ @Column("version")
+ private String version;
+
+ private String runStatus;
+
+ private CodeInfo codeInfo = new CodeInfo();
+
+ //
+ //
+ @Column("type")
+ private Integer type;
+
+ // 任务状态 0,停止 1運行
+ @Column("status")
+ private Integer status;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.name = JavaSourceUtil.findClassName(code);
+ this.code = code;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public String getScheduleStr() {
+ return scheduleStr;
+ }
+
+ public void setScheduleStr(String scheduleStr) {
+ this.scheduleStr = scheduleStr;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ public String getCodeType() {
+ return StringUtil.isBlank(codeType) ? "java" : codeType;
+ }
+
+ public void setCodeType(String codeType) {
+ this.codeType = StringUtil.isBlank(codeType) ? "java" : codeType;
+ }
+
+ public Long getGroupId() {
+ return groupId;
+ }
+
+ public void setGroupId(Long groupId) {
+ this.groupId = groupId;
+ }
+
+ public String getCreateUser() {
+ return createUser;
+ }
+
+ public void setCreateUser(String createUser) {
+ this.createUser = createUser;
+ }
+
+ public String getUpdateUser() {
+ return updateUser;
+ }
+
+ public void setUpdateUser(String updateUser) {
+ this.updateUser = updateUser;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getRunStatus() {
+ return runStatus;
+ }
+
+ public void setRunStatus(String runStatus) {
+ this.runStatus = runStatus;
+ }
+
+ public void setMessage(String message) {
+ SharedSpace.setTaskMessage(this.getId(), message) ;
+ }
+
+ public long getSuccess() {
+ return SharedSpace.getSuccess(this.getId());
+ }
+
+
+ public long getError() {
+ return SharedSpace.getError(this.getId());
+ }
+
+ public void updateError() {
+ SharedSpace.updateError(this.getId());
+ }
+
+ public void updateSuccess() {
+ SharedSpace.updateSuccess(this.getId());
+ }
+
+ public String getMessage() {
+ return SharedSpace.getTaskMessage(this.getId());
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public CodeInfo codeInfo() {
+ return codeInfo;
+ }
+
+}
diff --git a/src/main/java/org/nlpcn/jcoder/domain/TaskHistory.java b/src/main/java/org/nlpcn/jcoder/domain/TaskHistory.java
index c03fb89..614ee2e 100644
--- a/src/main/java/org/nlpcn/jcoder/domain/TaskHistory.java
+++ b/src/main/java/org/nlpcn/jcoder/domain/TaskHistory.java
@@ -1,185 +1,200 @@
-package org.nlpcn.jcoder.domain;
-
-import org.nutz.dao.entity.annotation.Column;
-import org.nutz.dao.entity.annotation.Id;
-import org.nutz.dao.entity.annotation.Table;
-
-import java.util.Date;
-
-@Table("task_history")
-public class TaskHistory {
-
- @Id
- private Long id;
-
- @Column("task_id")
- private Long taskId;
-
- @Column
- private String name;
-
- @Column
- private String description;
-
- @Column("schedule_str")
- private String scheduleStr;
-
- @Column
- private String code;
-
- @Column("group_name")
- private String groupName;
-
- @Column("create_user")
- private String createUser;
-
- @Column("update_user")
- private String updateUser;
-
- @Column("create_time")
- private Date createTime;
-
- @Column("update_time")
- private Date updateTime;
-
-
- @Column("version")
- private String version;
-
- @Column("type")
- private Integer type;
-
- @Column("status")
- private Integer status;
-
- public TaskHistory() {
- }
-
- public TaskHistory(Task t) {
- this.taskId = t.getId();
- this.code = t.getCode();
- this.createTime = t.getCreateTime();
- this.createUser = t.getCreateUser();
- this.description = t.getDescription();
- this.groupName = t.getGroupName();
- this.name = t.getName();
- this.scheduleStr = t.getScheduleStr();
- this.status = t.getStatus();
- this.type = t.getType();
- this.updateTime = t.getUpdateTime();
- this.updateUser = t.getUpdateUser();
- this.version = t.getVersion();
- }
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getScheduleStr() {
- return scheduleStr;
- }
-
- public void setScheduleStr(String scheduleStr) {
- this.scheduleStr = scheduleStr;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getGroupName() {
- return groupName;
- }
-
- public void setGroupId(String groupName) {
- this.groupName = groupName;
- }
-
- public String getCreateUser() {
- return createUser;
- }
-
- public void setCreateUser(String createUser) {
- this.createUser = createUser;
- }
-
- public String getUpdateUser() {
- return updateUser;
- }
-
- public void setUpdateUser(String updateUser) {
- this.updateUser = updateUser;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public void setStatus(Integer status) {
- this.status = status;
- }
-
- public Long getTaskId() {
- return taskId;
- }
-
- public void setTaskId(Long taskId) {
- this.taskId = taskId;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-}
+package org.nlpcn.jcoder.domain;
+
+import org.nutz.dao.entity.annotation.Column;
+import org.nutz.dao.entity.annotation.Id;
+import org.nutz.dao.entity.annotation.Table;
+
+import java.util.Date;
+
+@Table("task_history")
+public class TaskHistory {
+
+ @Id
+ private Long id;
+
+ @Column("task_id")
+ private Long taskId;
+
+ @Column
+ private String name;
+
+ @Column
+ private String description;
+
+ @Column("schedule_str")
+ private String scheduleStr;
+
+ @Column
+ private String code;
+
+ @Column("code_type")
+ private String codeType;
+
+ @Column("group_id")
+ private Long groupId;
+
+ @Column("create_user")
+ private String createUser;
+
+ @Column("update_user")
+ private String updateUser;
+
+ @Column("create_time")
+ private Date createTime;
+
+ @Column("update_time")
+ private Date updateTime;
+
+
+ @Column("version")
+ private String version;
+
+ @Column("type")
+ private Integer type;
+
+ @Column("status")
+ private Integer status;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getScheduleStr() {
+ return scheduleStr;
+ }
+
+ public void setScheduleStr(String scheduleStr) {
+ this.scheduleStr = scheduleStr;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getCodeType() {
+ return codeType;
+ }
+
+ public void setCodeType(String codeType) {
+ this.codeType = codeType;
+ }
+
+ public Long getGroupId() {
+ return groupId;
+ }
+
+ public void setGroupId(Long groupId) {
+ this.groupId = groupId;
+ }
+
+ public String getCreateUser() {
+ return createUser;
+ }
+
+ public void setCreateUser(String createUser) {
+ this.createUser = createUser;
+ }
+
+ public String getUpdateUser() {
+ return updateUser;
+ }
+
+ public void setUpdateUser(String updateUser) {
+ this.updateUser = updateUser;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+
+ public TaskHistory() {
+ }
+
+ public TaskHistory(Task t) {
+ this.taskId = t.getId();
+ this.code = t.getCode();
+ this.codeType = t.getCodeType();
+ this.createTime = t.getCreateTime();
+ this.createUser = t.getCreateUser();
+ this.description = t.getDescription();
+ this.groupId = t.getGroupId();
+ this.name = t.getName();
+ this.scheduleStr = t.getScheduleStr();
+ this.status = t.getStatus();
+ this.type = t.getType();
+ this.updateTime = t.getUpdateTime();
+ this.updateUser = t.getUpdateUser();
+ this.version = t.getVersion();
+ }
+
+ public Long getTaskId() {
+ return taskId;
+ }
+
+ public void setTaskId(Long taskId) {
+ this.taskId = taskId;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+
+}
diff --git a/src/main/java/org/nlpcn/jcoder/domain/TaskInfo.java b/src/main/java/org/nlpcn/jcoder/domain/TaskInfo.java
index 30a6286..510fd70 100644
--- a/src/main/java/org/nlpcn/jcoder/domain/TaskInfo.java
+++ b/src/main/java/org/nlpcn/jcoder/domain/TaskInfo.java
@@ -1,149 +1,135 @@
-package org.nlpcn.jcoder.domain;
-
-import org.nlpcn.jcoder.util.StaticValue;
-
-public class TaskInfo {
-
- private Long id;
-
- private String name;
-
- private String taskName;
-
- private String description;
-
- private long success;
-
- private long error;
-
- private String groupName;
-
- private long startTime;
-
- private Integer status;
-
- private String hostPort;
-
- /**
- * 标记状态 调度 活动 正在停止
- */
- private String runStatus;
-
- public TaskInfo() {
- }
-
- ;
-
- public TaskInfo(String name, Task task, long startTime) {
- this.id = task.getId();
- this.name = name;
- this.taskName = task.getName();
- this.description = task.getDescription();
- this.success = task.success();
- this.error = task.error();
- this.groupName = task.getGroupName();
- this.status = task.getStatus();
- this.runStatus = task.getRunStatus();
- this.startTime = startTime;
- this.hostPort = StaticValue.getHostPort();
- }
-
- public TaskInfo(String name, String taskName, String groupName) {
- this.id = 0L;
- this.name = name;
- this.taskName = taskName;
- this.success = 0;
- this.error = 0;
- this.groupName = groupName;
- this.status = 1;
- this.hostPort = StaticValue.getHostPort();
- }
-
- public long getStartTime() {
- return startTime;
- }
-
- public void setStartTime(long startTime) {
- this.startTime = startTime;
- }
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public long getSuccess() {
- return success;
- }
-
- public void setSuccess(long success) {
- this.success = success;
- }
-
- public long getError() {
- return error;
- }
-
- public void setError(long error) {
- this.error = error;
- }
-
- public String getGroupName() {
- return groupName;
- }
-
- public void setGroupName(String groupName) {
- this.groupName = groupName;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public void setStatus(Integer status) {
- this.status = status;
- }
-
- public String getRunStatus() {
- return runStatus;
- }
-
- public void setRunStatus(String runStatus) {
- this.runStatus = runStatus;
- }
-
- public String getTaskName() {
- return taskName;
- }
-
- public void setTaskName(String taskName) {
- this.taskName = taskName;
- }
-
- public String getHostPort() {
- return hostPort;
- }
-
- public void setHostPort(String hostPort) {
- this.hostPort = hostPort;
- }
-}
+package org.nlpcn.jcoder.domain;
+
+public class TaskInfo {
+
+ private Long id;
+
+ private String name;
+
+ private String taskName ;
+
+ private String description;
+
+ private long success;
+
+ private long error;
+
+ private Long groupId;
+
+ private String message;
+
+ private long startTime;
+
+ private Integer status;
+
+ /**
+ * 标记状态 调度 活动 正在停止
+ */
+ private String runStatus;
+
+ public TaskInfo() {
+ };
+
+ public TaskInfo(String name ,Task task, long startTime) {
+ this.id = task.getId();
+ this.name = name;
+ this.taskName = task.getName() ;
+ this.description = task.getDescription();
+ this.success = task.getSuccess();
+ this.error = task.getError();
+ this.groupId = task.getGroupId();
+ this.message = task.getMessage();
+ this.status = task.getStatus();
+ this.runStatus = task.getRunStatus();
+ this.startTime = startTime;
+ }
+
+ public long getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(long startTime) {
+ this.startTime = startTime;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public long getSuccess() {
+ return success;
+ }
+
+ public void setSuccess(long success) {
+ this.success = success;
+ }
+
+ public long getError() {
+ return error;
+ }
+
+ public void setError(long error) {
+ this.error = error;
+ }
+
+ public Long getGroupId() {
+ return groupId;
+ }
+
+ public void setGroupId(Long groupId) {
+ this.groupId = groupId;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ public String getRunStatus() {
+ return runStatus;
+ }
+
+ public void setRunStatus(String runStatus) {
+ this.runStatus = runStatus;
+ }
+
+ public String getTaskName() {
+ return taskName;
+ }
+
+ public void setTaskName(String taskName) {
+ this.taskName = taskName;
+ }
+
+}
diff --git a/src/main/java/org/nlpcn/jcoder/domain/TaskStatistics.java b/src/main/java/org/nlpcn/jcoder/domain/TaskStatistics.java
deleted file mode 100644
index 164d94c..0000000
--- a/src/main/java/org/nlpcn/jcoder/domain/TaskStatistics.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.nlpcn.jcoder.domain;
-
-/**
- * Created by Ansj on 28/12/2017.
- */
-public class TaskStatistics {
- private String hostPort;
-
- private long success;
-
- private long error;
-
- private long sumWeight;
-
- private long weight;
-
- private HostGroup hostGroup;
-
- public String getHostPort() {
- return hostPort;
- }
-
- public void setHostPort(String hostPort) {
- this.hostPort = hostPort;
- }
-
- public long getSuccess() {
- return success;
- }
-
- public void setSuccess(long success) {
- this.success = success;
- }
-
- public long getError() {
- return error;
- }
-
- public void setError(long error) {
- this.error = error;
- }
-
- public String getSuccessAlias() {
- return num2Str(success);
- }
-
-
- public String getErrorAlias() {
- return num2Str(error);
- }
-
- private String num2Str(long error) {
- String result = String.valueOf(error);
- if (error > 999999) {
- result = (error / 1000) + "k";
- } else if (error > 999999999) {
- result = (error / 1000000) + "m";
- }
- return result;
- }
-
- public long getSumWeight() {
- if (sumWeight == 0) {
- sumWeight = 1;
- }
- return sumWeight;
- }
-
- public void setSumWeight(long sumWeight) {
- this.sumWeight = sumWeight;
- }
-
- public long getWeight() {
- return weight;
- }
-
- public void setWeight(long weight) {
- this.weight = weight;
- }
-
- public HostGroup getHostGroup() {
- return hostGroup;
- }
-
- public void setHostGroup(HostGroup hostGroup) {
- this.hostGroup = hostGroup;
- }
-}
diff --git a/src/main/java/org/nlpcn/jcoder/domain/Token.java b/src/main/java/org/nlpcn/jcoder/domain/Token.java
index 64b20ac..6faa13c 100644
--- a/src/main/java/org/nlpcn/jcoder/domain/Token.java
+++ b/src/main/java/org/nlpcn/jcoder/domain/Token.java
@@ -1,135 +1,65 @@
-package org.nlpcn.jcoder.domain;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.annotation.JSONField;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * token entity
- *
- * @author Ansj
- */
-public class Token implements Serializable {
-
- public static final Token NULL = new Token();
-
- private String token;
-
- private String userStr;
-
- @JSONField(serialize = false, deserialize = false)
- private User user;
-
- private long expiration = 30 * 60 * 1000L;
-
- private Date expirationTime;
-
- private Date createTime;
-
- private Map params;
-
- /**
- * 权限数组。* 为全部
- */
- private Set authorizes = new HashSet<>();
-
- public String getToken() {
- return token;
- }
-
- public void setToken(String token) {
- this.token = token;
- }
-
- public String getUserStr() {
- return userStr;
- }
-
- public void setUserStr(String userStr) {
- this.userStr = userStr;
- }
-
- public User getUser() {
- return getUser(User.class);
- }
-
- public T getUser(Class clazz) {
- if (user == null) {
- user = JSON.parseObject(userStr, clazz);
- }
- return clazz.cast(user);
- }
-
- public void setUser(User user) {
- userStr = JSON.toJSONString(this.user = user);
- }
-
- public Date getExpirationTime() {
- return expirationTime;
- }
-
- public void setExpirationTime(Date expirationTime) {
- this.expirationTime = expirationTime;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
-
- public void addAuthorize(String authorize) {
- if (!authorize.contains("/")) {
- authorize = authorize + "/*";
- }
- authorizes.add(authorize);
- }
-
- public void rmAuthorize(String authorize) {
- authorizes.remove(authorize);
- }
-
- public boolean authorize(String className, String methodName) {
- if (authorizes.size() == 0) {
- return true;
- }
- if (authorizes.contains(className + "/*")) {
- return true;
- }
- return authorizes.contains(className + "/" + methodName);
- }
-
- public long getExpiration() {
- return expiration;
- }
-
- public void setExpiration(long expiration) {
- this.expiration = expiration;
- }
-
- public boolean authorize(String authorize) {
- if (authorizes.size() == 0) {
- return true;
- }
- if (!authorize.contains("/")) {
- authorize = authorize + "/*";
- }
- return authorizes.contains(authorize);
- }
-
- public Map getParams() {
- return params;
- }
-
- public void setParams(Map params) {
- this.params = params;
- }
-}
+package org.nlpcn.jcoder.domain;
+
+import java.util.Date;
+
+/**
+ * token entity
+ *
+ * @author Ansj
+ *
+ */
+public class Token {
+
+ public static final Token NULL = new Token();
+
+ private String token;
+
+ private User user;
+
+ private Date expirationTime;
+
+ private Date createTime;
+
+ private long times;
+
+ public long addTimes() {
+ return ++times;
+ }
+
+ public String getToken() {
+ return token;
+ }
+
+ public void setToken(String token) {
+ this.token = token;
+ }
+
+ public User getUser() {
+ return user;
+ }
+
+ public void setUser(User user) {
+ this.user = user;
+ }
+
+ public Date getExpirationTime() {
+ return expirationTime;
+ }
+
+ public void setExpirationTime(Date expirationTime) {
+ this.expirationTime = expirationTime;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public long getTimes() {
+ return times;
+ }
+
+}
diff --git a/src/main/java/org/nlpcn/jcoder/domain/User.java b/src/main/java/org/nlpcn/jcoder/domain/User.java
index a01dc52..7f1c53f 100644
--- a/src/main/java/org/nlpcn/jcoder/domain/User.java
+++ b/src/main/java/org/nlpcn/jcoder/domain/User.java
@@ -4,24 +4,10 @@
import org.nutz.dao.entity.annotation.Id;
import org.nutz.dao.entity.annotation.Table;
-import java.io.Serializable;
import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
@Table("user")
-public class User implements Serializable {
-
- public static final User CLUSTER_USER = new User();
-
- static {
- CLUSTER_USER.setId((long) -1);
- CLUSTER_USER.setName("cluster");
- CLUSTER_USER.setCreateTime(new Date());
- CLUSTER_USER.setMail("cluster@jcoder.com");
- CLUSTER_USER.setPassword("");
- CLUSTER_USER.type = 1;
- }
+public class User {
@Id
private Long id;
@@ -33,17 +19,17 @@ public class User implements Serializable {
private String password;
@Column("type")
- private int type; // 用户类型 0游客 1管理员
+ private int type; // 用户类型 1超级用户、2组长、3组员
@Column
private String mail; // 用户邮箱
+
+// @Column
+// private String token ;
@Column("create_time")
private Date createTime; // 创建时间
- //扩展用户的属性字段
- private Map attr;
-
public Long getId() {
return id;
}
@@ -73,9 +59,6 @@ public int getType() {
}
public void setType(int type) {
- if (this.id != null && this.id == -1 && type != 1) { //cluster user不让改类型
- throw new RuntimeException("cluster user must not modify");
- }
this.type = type;
}
@@ -95,25 +78,12 @@ public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
-
- /**
- * 通用属性的拓展添加。不是线程安全的
- */
- public void put(String key, Object value) {
- if (attr == null) {
- attr = new HashMap<>();
- }
- this.attr.put(key, value);
- }
-
- /**
- * 获得属性
- */
- public Object get(String key) {
- if (attr == null) {
- return null;
- }
- return attr.get(key);
- }
+// public String getToken() {
+// return token;
+// }
+//
+// public void setToken(String token) {
+// this.token = token;
+// }
}
diff --git a/src/main/java/org/nlpcn/jcoder/domain/UserGroup.java b/src/main/java/org/nlpcn/jcoder/domain/UserGroup.java
new file mode 100644
index 0000000..58dcddc
--- /dev/null
+++ b/src/main/java/org/nlpcn/jcoder/domain/UserGroup.java
@@ -0,0 +1,67 @@
+package org.nlpcn.jcoder.domain;
+
+import org.nutz.dao.entity.annotation.Column;
+import org.nutz.dao.entity.annotation.Id;
+import org.nutz.dao.entity.annotation.Table;
+
+import java.util.Date;
+
+@Table("user_group")
+public class UserGroup {
+
+ @Id
+ private Long id;
+ @Column("user_id")
+ private Long userId;
+ @Column("group_id")
+ private Long groupId;
+ @Column("create_time")
+ private Date createTime;
+ @Column("auth")
+ private Integer auth; //1 查看 2 编辑
+
+ public Long getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Long userId) {
+ this.userId = userId;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Long getGroupId() {
+ return groupId;
+ }
+
+ public void setGroupId(Long groupId) {
+ this.groupId = groupId;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Integer getAuth() {
+ return auth;
+ }
+
+ public void setAuth(Integer auth) {
+ this.auth = auth;
+ }
+
+ @Override
+ public String toString() {
+ return "UserGroup [id=" + id + ", userId=" + userId + ", groupId=" + groupId + ", createTime=" + createTime + "]";
+ }
+}
diff --git a/src/main/java/org/nlpcn/jcoder/filter/AuthoritiesManager.java b/src/main/java/org/nlpcn/jcoder/filter/AuthoritiesManager.java
index 7ac32f8..7a01853 100644
--- a/src/main/java/org/nlpcn/jcoder/filter/AuthoritiesManager.java
+++ b/src/main/java/org/nlpcn/jcoder/filter/AuthoritiesManager.java
@@ -1,55 +1,46 @@
-package org.nlpcn.jcoder.filter;
-
-import org.nlpcn.jcoder.constant.UserConstants;
-import org.nlpcn.jcoder.domain.Token;
-import org.nlpcn.jcoder.run.mvc.view.JsonView;
-import org.nlpcn.jcoder.service.TokenService;
-import org.nlpcn.jcoder.util.ApiException;
-import org.nlpcn.jcoder.util.Restful;
-import org.nlpcn.jcoder.util.StringUtil;
-import org.nutz.mvc.ActionContext;
-import org.nutz.mvc.ActionFilter;
-import org.nutz.mvc.Mvcs;
-import org.nutz.mvc.View;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.http.HttpSession;
-
-public class AuthoritiesManager implements ActionFilter {
-
- private static final Logger LOG = LoggerFactory.getLogger(AuthoritiesManager.class);
-
- @Override
- public View match(ActionContext actionContext) {
- HttpSession session = Mvcs.getHttpSession();
-
- Object obj = session.getAttribute(UserConstants.USER);
-
- if (obj != null) {
- return null;
- }
-
- String tokenStr = actionContext.getRequest().getHeader(UserConstants.CLUSTER_TOKEN_HEAD);
-
- if (StringUtil.isNotBlank(tokenStr)) {
- try {
-
- Token token = TokenService.getToken(tokenStr);
-
- if (token != null) {
- actionContext.getRequest().getSession().setAttribute(UserConstants.USER, token.getUser());
- return null;
- }
-
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
-
- return new JsonView(Restful.instance().code(ApiException.TokenAuthorNotFound).msg("未登录").ok(false));
- }
-
-}
+package org.nlpcn.jcoder.filter;
+
+import org.nutz.mvc.ActionContext;
+import org.nutz.mvc.ActionFilter;
+import org.nutz.mvc.Mvcs;
+import org.nutz.mvc.View;
+import org.nutz.mvc.view.ServerRedirectView;
+
+import javax.servlet.http.HttpSession;
+
+public class AuthoritiesManager implements ActionFilter {
+
+ private String name;
+ private String value;
+ private String path;
+
+ public AuthoritiesManager(String name, String value, String path) {
+ this.name = name;
+ this.path = path;
+ this.value = value;
+ }
+
+ @Override
+ public View match(ActionContext actionContext) {
+ HttpSession session = Mvcs.getHttpSession(false);
+
+ if (session == null) {
+ return new ServerRedirectView(path);
+ }
+
+ @SuppressWarnings("all")
+ Object obj = session.getAttribute(name);
+ if (value != null) {
+ if (!value.equals(String.valueOf(obj))) {
+ return new ServerRedirectView(path);
+ }
+ } else {
+ if (obj != null) {
+ return new ServerRedirectView(path);
+ }
+ }
+
+ return null;
+ }
+
+}
diff --git a/src/main/java/org/nlpcn/jcoder/filter/HostFilter.java b/src/main/java/org/nlpcn/jcoder/filter/HostFilter.java
index 366c202..311e77a 100644
--- a/src/main/java/org/nlpcn/jcoder/filter/HostFilter.java
+++ b/src/main/java/org/nlpcn/jcoder/filter/HostFilter.java
@@ -1,57 +1,33 @@
-package org.nlpcn.jcoder.filter;
-
-import org.nlpcn.jcoder.run.mvc.view.JsonView;
-import org.nlpcn.jcoder.run.rpc.RpcFilter;
-import org.nlpcn.jcoder.run.rpc.Rpcs;
-import org.nlpcn.jcoder.run.rpc.domain.RpcRequest;
-import org.nlpcn.jcoder.util.ApiException;
-import org.nlpcn.jcoder.util.Restful;
-import org.nlpcn.jcoder.util.StaticValue;
-import org.nlpcn.jcoder.util.StringUtil;
-import org.nutz.mvc.ActionContext;
-import org.nutz.mvc.ActionFilter;
-import org.nutz.mvc.View;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.http.HttpServletRequest;
-
-public class HostFilter implements ActionFilter, RpcFilter {
-
- private static final Logger LOG = LoggerFactory.getLogger(IpErrorCountFilter.class);
-
- private static final String host = StaticValue.getConfigHost();
-
- @Override
- public View match(ActionContext actionContext) {
-
- if ("*".equals(host)) {
- return null;
- }
-
- HttpServletRequest request = actionContext.getRequest();
-
- if (!host.equals(request.getServerName())) {
- LOG.info(request.getServletPath() + " only vist by host! the server name is : " + request.getServerName());
- return new JsonView(Restful.instance(false, request.getServletPath() + " only vist by host! ", null, ApiException.Unauthorized));
- }
-
- return null;
- }
-
- @Override
- public Restful match(RpcRequest req) {
-
- if (StringUtil.isBlank(host) || "*".equals(host)) {
- return null;
- }
-
- if (!host.equals(Rpcs.ctx().localAddress())) {
- LOG.info(Rpcs.ctx().remoteAddress() + " only vist by host! the server name is : " + Rpcs.ctx().localAddress());
- return Restful.instance(false, req.getClassName() + "/" + req.getMethodName() + " only vist by host! ", null, ApiException.Unauthorized);
- }
-
- return null;
- }
-
-}
+package org.nlpcn.jcoder.filter;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.nlpcn.commons.lang.util.StringUtil;
+import org.nlpcn.jcoder.run.mvc.view.JsonView;
+import org.nlpcn.jcoder.util.ApiException;
+import org.nlpcn.jcoder.util.StaticValue;
+import org.nutz.mvc.ActionContext;
+import org.nutz.mvc.ActionFilter;
+import org.nutz.mvc.View;
+
+public class HostFilter implements ActionFilter {
+
+ private static final String host = StaticValue.HOST ;
+
+ @Override
+ public View match(ActionContext actionContext) {
+
+ if(StringUtil.isBlank(host) || "*".equals(host)){
+ return null ;
+ }
+
+ HttpServletRequest request = actionContext.getRequest() ;
+
+ if(!host.equals(request.getServerName())){
+ return new JsonView(ApiException.Unauthorized, request.getServletPath()+" only vist by host! ");
+ }
+
+ return null;
+ }
+
+}
diff --git a/src/main/java/org/nlpcn/jcoder/filter/IpErrorCountFilter.java b/src/main/java/org/nlpcn/jcoder/filter/IpErrorCountFilter.java
deleted file mode 100644
index 0c726bb..0000000
--- a/src/main/java/org/nlpcn/jcoder/filter/IpErrorCountFilter.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.nlpcn.jcoder.filter;
-
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import org.nlpcn.jcoder.run.mvc.view.JsonView;
-import org.nlpcn.jcoder.run.rpc.RpcFilter;
-import org.nlpcn.jcoder.run.rpc.Rpcs;
-import org.nlpcn.jcoder.run.rpc.domain.RpcRequest;
-import org.nlpcn.jcoder.util.ApiException;
-import org.nlpcn.jcoder.util.Restful;
-import org.nlpcn.jcoder.util.StaticValue;
-import org.nlpcn.jcoder.util.StringUtil;
-import org.nutz.mvc.ActionContext;
-import org.nutz.mvc.ActionFilter;
-import org.nutz.mvc.Mvcs;
-import org.nutz.mvc.View;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * this filter record err times by err() , if times gather than maxCount , it while be shield your request
- *
- * @author ansj
- */
-public class IpErrorCountFilter implements ActionFilter, RpcFilter {
-
- private static final Logger LOG = LoggerFactory.getLogger(IpErrorCountFilter.class);
-
- private static final Cache IP_CACHW = CacheBuilder.newBuilder().maximumSize(10000).expireAfterWrite(20, TimeUnit.MINUTES).build();
-
- private int maxCount;
-
- public IpErrorCountFilter(String maxCountStr) {
- if (StringUtil.isBlank(maxCountStr)) {
- maxCount = 1;
- } else {
- this.maxCount = Integer.parseInt(maxCountStr);
- }
- }
-
- public static int err() {
- return err(StaticValue.getRemoteHost(Mvcs.getReq()));
-
- }
-
- public static int err(String key) {
- try {
- AtomicInteger count = IP_CACHW.get(key, () -> {
- return new AtomicInteger();
- });
- int err = count.incrementAndGet();
- LOG.info(key + " err times " + err);
- return err;
- } catch (ExecutionException e) {
- e.printStackTrace();
- LOG.error(e.getMessage(), e);
- }
- return 0;
- }
-
- @Override
- public View match(ActionContext actionContext) {
-
- String ip = StaticValue.getRemoteHost(actionContext.getRequest());
-
- AtomicInteger times = IP_CACHW.getIfPresent(ip);
-
- if (times == null) {
- return null;
- }
-
- if (times.get() >= maxCount) {
- LOG.info(ip + "err times gather than " + maxCount);
- return new JsonView(Restful.instance(false, "your err times gather than " + maxCount + " please wait 20 minute try again", null, ApiException.Unauthorized));
- }
-
- return null;
- }
-
- @Override
- public Restful match(RpcRequest req) {
-
- String ip = Rpcs.ctx().remoteAddress();
-
- AtomicInteger times = IP_CACHW.getIfPresent(ip);
-
- if (times == null) {
- return null;
- }
-
- if (times.get() >= maxCount) {
- LOG.info(ip + "err times gather than " + maxCount);
- return Restful.instance(false, "your err times gather than " + maxCount + " please wait 20 minute try again", null, ApiException.Unauthorized);
- }
-
- return null;
- }
-
-}
diff --git a/src/main/java/org/nlpcn/jcoder/filter/JcoderFilter.java b/src/main/java/org/nlpcn/jcoder/filter/JcoderFilter.java
index 5a09515..96667cb 100644
--- a/src/main/java/org/nlpcn/jcoder/filter/JcoderFilter.java
+++ b/src/main/java/org/nlpcn/jcoder/filter/JcoderFilter.java
@@ -1,100 +1,95 @@
-package org.nlpcn.jcoder.filter;
-
-import org.nlpcn.jcoder.run.mvc.ApiActionHandler;
-import org.nlpcn.jcoder.run.mvc.view.JsonView;
-import org.nlpcn.jcoder.util.ApiException;
-import org.nlpcn.jcoder.util.Restful;
-import org.nlpcn.jcoder.util.StaticValue;
-import org.nlpcn.jcoder.util.StringUtil;
-import org.nutz.mvc.Mvcs;
-import org.nutz.mvc.NutFilter;
-import org.nutz.mvc.config.FilterNutConfig;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-public class JcoderFilter extends NutFilter {
-
- private static final String JCODER_NAME = "jcoder";
- private static final byte[] AUTH_ERR = "no right to call this server".getBytes();
- private ApiActionHandler apiHandler;
- private String host;
-
- public void init(FilterConfig conf) throws ServletException {
- super.init(conf);
- FilterNutConfig config = new FilterNutConfig(conf);
- apiHandler = new ApiActionHandler(config);
- host = StaticValue.getConfigHost();
- }
-
- @Override
- public void doFilter(final ServletRequest req, final ServletResponse resp, final FilterChain chain) throws IOException, ServletException {
- HttpServletRequest request = (HttpServletRequest) req;
- HttpServletResponse response = (HttpServletResponse) resp;
- String path = request.getServletPath();
-
-
- if (path.startsWith("/api/")) {
- _doFilter(chain, request, response);
- } else {
- if (StringUtil.isBlank(host) || "*".equals(host) || StaticValue.SELF_HOST.equals(request.getServerName()) || host.equals(request.getServerName()) || request.getServletPath().startsWith("/apidoc")) {
- super.doFilter(request, response, chain);
- } else {
- _doAuthoErr(request, response);
- }
- }
-
- }
-
- private void _doAuthoErr(HttpServletRequest request, HttpServletResponse response) throws IOException {
- try {
- request.getSession().invalidate();
- response.setStatus(403);
- response.setHeader("Cache-Control", "no-cache");
- response.setContentType("text/html");
- response.setContentLength(AUTH_ERR.length);
- response.getOutputStream().write(AUTH_ERR);
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- response.getOutputStream().flush();
- response.getOutputStream().close();
- }
- }
-
- private void _doFilter(final FilterChain chain, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
- Mvcs.setServletContext(sc);
- try {
- Mvcs.set(Thread.currentThread().getName(), request, response);
- Mvcs.setIoc(Mvcs.ctx().iocs.get(this.selfName));
- Mvcs.setAtMap(Mvcs.ctx().atMaps.get(this.selfName));
- if (!apiHandler.handle(request, response)) {
- try {
- new JsonView().render(request, response, Restful.instance(false, "api not found ! may be it not actived!", null, ApiException.NotFound));
- } catch (Throwable e) {
- nextChain(request, response, chain);
- }
- }
- } catch (Exception e) {
- try {
- new JsonView().render(request, response, Restful.instance(false, e.getMessage(), null, ApiException.ServerException));
- } catch (Throwable e1) {
- nextChain(request, response, chain);
- }
- } finally {
- Mvcs.set(null, null, null);
- Mvcs.ctx().removeReqCtx();
- Mvcs.setServletContext(null);
- if (request.getSession(false) != null && request.getSession(false).getAttribute("user") == null) { //if session is empty
- request.getSession().invalidate();
- }
- }
- }
-
- public ApiActionHandler getApiHandler() {
- return apiHandler;
- }
-
-}
+package org.nlpcn.jcoder.filter;
+
+import java.io.IOException;
+
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.nlpcn.commons.lang.util.StringUtil;
+import org.nlpcn.jcoder.run.mvc.ApiActionHandler;
+import org.nlpcn.jcoder.run.mvc.view.JsonView;
+import org.nlpcn.jcoder.util.ApiException;
+import org.nlpcn.jcoder.util.StaticValue;
+import org.nutz.mvc.Mvcs;
+import org.nutz.mvc.NutFilter;
+
+public class JcoderFilter extends NutFilter {
+
+ private ApiActionHandler apiHandler;
+
+ private String host;
+
+ private static final byte[] AUTH_ERR = "no right to call this server".getBytes();
+
+ public void init(FilterConfig conf) throws ServletException {
+ super.init(conf);
+ apiHandler = new ApiActionHandler(conf);
+ host = StaticValue.HOST;
+ }
+
+ @Override
+ public void doFilter(final ServletRequest req, final ServletResponse resp, final FilterChain chain) throws IOException, ServletException {
+ HttpServletRequest request = (HttpServletRequest) req;
+ HttpServletResponse response = (HttpServletResponse) resp;
+ String path = request.getServletPath();
+
+ if (path.startsWith("/api/")) {
+ _doFilter(chain, request, response);
+ } else {
+ if (host == null || "*".equals(host) || StringUtil.isBlank("host") || host.equals(request.getServerName()) || request.getServletPath().startsWith("/apidoc")) {
+ super.doFilter(request, response, chain);
+ } else {
+ _doAuthoErr(response);
+ }
+ }
+ }
+
+ private void _doAuthoErr(HttpServletResponse response) throws IOException {
+ try {
+ response.setStatus(403);
+ response.setHeader("Cache-Control", "no-cache");
+ response.setContentType("text/html");
+ response.setContentLength(AUTH_ERR.length);
+ response.getOutputStream().write(AUTH_ERR);
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ response.getOutputStream().flush();
+ response.getOutputStream().close();
+ }
+ }
+
+ private void _doFilter(final FilterChain chain, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+ Mvcs.setIoc(StaticValue.getUserIoc()); // reset ioc
+
+ Mvcs.setServletContext(sc);
+
+ try {
+
+ Mvcs.set(this.selfName, request, response);
+
+ if (!apiHandler.handle(request, response)) {
+ try {
+ new JsonView(ApiException.NotFound, "api not found ! may be it not actived!").render(request, response, null);
+ } catch (Throwable e) {
+ nextChain(request, response, chain);
+ }
+ }
+
+ } finally {
+ Mvcs.set(null, null, null);
+ Mvcs.ctx().removeReqCtx();
+ Mvcs.setServletContext(null);
+ }
+ }
+
+ public ApiActionHandler getApiHandler() {
+ return apiHandler;
+ }
+
+}
diff --git a/src/main/java/org/nlpcn/jcoder/filter/TestingFilter.java b/src/main/java/org/nlpcn/jcoder/filter/TestingFilter.java
deleted file mode 100644
index 04e5fe9..0000000
--- a/src/main/java/org/nlpcn/jcoder/filter/TestingFilter.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package org.nlpcn.jcoder.filter;
-
-import org.nlpcn.jcoder.domain.KeyValue;
-import org.nlpcn.jcoder.run.annotation.Execute;
-import org.nlpcn.jcoder.run.annotation.Single;
-import org.nlpcn.jcoder.run.mvc.processor.ApiAdaptorProcessor;
-import org.nlpcn.jcoder.run.mvc.processor.ApiCrossOriginProcessor;
-import org.nlpcn.jcoder.run.mvc.view.JsonView;
-import org.nlpcn.jcoder.util.ApiException;
-import org.nlpcn.jcoder.util.StringUtil;
-import org.nutz.ioc.Ioc;
-import org.nutz.ioc.loader.annotation.Inject;
-import org.nutz.lang.Mirror;
-import org.nutz.mvc.ActionContext;
-import org.nutz.mvc.ActionInfo;
-import org.nutz.mvc.Mvcs;
-import org.nutz.mvc.NutFilter;
-import org.nutz.resource.Scans;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class TestingFilter extends NutFilter {
-
- private static final Logger LOG = LoggerFactory.getLogger(TestingFilter.class);
-
- public static Map> methods = new HashMap<>();
-
- public static Ioc ioc = null;
-
- public static void init(Ioc ioc, String... packages) throws IOException {
- TestingFilter.ioc = ioc;
- Map> tempMethods = new HashMap<>();
- for (String pk : packages) {
- List> list = Scans.me().scanPackage(pk);
- list.forEach(cla -> {
- Object obj = null;
- Single single = Mirror.getAnnotationDeep(cla, Single.class);
-
- for (Method method : cla.getMethods()) {
- if (!Modifier.isPublic(method.getModifiers()) || method.isBridge() || method.getDeclaringClass() != cla) {
- continue;
- }
-
- if (Mirror.getAnnotationDeep(method, Execute.class) != null) {
- if (obj == null && (single == null || single.value())) { //用懒加载方式
- try {
- obj = cla.newInstance();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- String path = cla.getSimpleName() + "/" + method.getName();
- LOG.info("find api : " + path);
- tempMethods.put(path, KeyValue.with(method, obj));
- }
- }
-
- obj = null;
- });
- }
-
- methods = tempMethods;
- }
-
- @Override
- public void init(FilterConfig conf) throws ServletException {
- sc = conf.getServletContext();
- }
-
- @Override
- public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws IOException, ServletException {
-
- HttpServletRequest request = (HttpServletRequest) req;
- HttpServletResponse response = (HttpServletResponse) resp;
-
- Mvcs.setIoc(ioc); // reset ioc
-
- Mvcs.setServletContext(sc);
-
- ActionContext ac = new ActionContext();
-
- String apiPath = request.getServletPath().substring(5);
-
- try {
- Mvcs.set("testing_filter", request, response);
-
- ac.setRequest(request).setResponse(response).setServletContext(request.getServletContext());
- Mvcs.setActionContext(ac);
-
- KeyValue keyValue = methods.get(apiPath);
-
- if (keyValue == null) {
- throw new ApiException(404, "api not found " + apiPath);
- }
-
- // add encoding
- request.setCharacterEncoding("utf-8");
- response.setCharacterEncoding("utf-8");
-
- new ApiCrossOriginProcessor().process(ac); // add cross origin
-
- Method method = keyValue.getKey();
- Class clz = method.getDeclaringClass();
-
- ac.setModule(keyValue.getValue() == null ? clz.newInstance() : keyValue.getValue());
- ac.setMethod(method);
-
- ActionInfo actionInfo = new ActionInfo();
- actionInfo.setMethod(method);
- actionInfo.setModuleType(clz);
-
- //set url to args
- ApiAdaptorProcessor apiAdaptorProcessor = new ApiAdaptorProcessor();
- apiAdaptorProcessor.init(Mvcs.getNutConfig(), actionInfo);
- apiAdaptorProcessor.process(ac);
-
- //ioc set
- Mirror mirror = Mirror.me(clz);
- for (Field field : mirror.getFields()) {
- Inject inject = field.getAnnotation(Inject.class);
- if (inject != null) {
- field.setAccessible(true);
- if (field.getType().equals(org.slf4j.Logger.class)) {
- mirror.setValue(ac.getModule(), field, LoggerFactory.getLogger(ac.getModule().getClass()));
- } else {
- mirror.setValue(ac.getModule(), field,
- ioc.get(field.getType(), StringUtil.isBlank(inject.value()) ? field.getName() : inject.value()));
- }
- field.setAccessible(false);
- }
- }
-
- Object invoke = ac.getMethod().invoke(ac.getModule(), ac.getMethodArgs());
-
- new JsonView().render(request, response, invoke);
- } catch (Throwable e) {
- e.printStackTrace();
- try {
- new JsonView().render(request, response, e);
- } catch (Throwable e1) {
- e1.printStackTrace();
- }
- } finally {
- Mvcs.set(null, null, null);
- Mvcs.ctx().removeReqCtx();
- Mvcs.setServletContext(null);
- if (request.getSession(false) != null && request.getSession(false).getAttribute("user") == null) { //if session is empty
- request.getSession().invalidate();
- }
- }
-
- }
-
- @Override
- public void destroy() {
- System.out.println("destroy");
- }
-
-}
diff --git a/src/main/java/org/nlpcn/jcoder/filter/TokenFilter.java b/src/main/java/org/nlpcn/jcoder/filter/TokenFilter.java
index f6f425c..ac215df 100644
--- a/src/main/java/org/nlpcn/jcoder/filter/TokenFilter.java
+++ b/src/main/java/org/nlpcn/jcoder/filter/TokenFilter.java
@@ -1,125 +1,36 @@
-package org.nlpcn.jcoder.filter;
-
-import org.nlpcn.jcoder.constant.UserConstants;
-import org.nlpcn.jcoder.domain.Token;
-import org.nlpcn.jcoder.run.mvc.view.JsonView;
-import org.nlpcn.jcoder.run.rpc.RpcFilter;
-import org.nlpcn.jcoder.run.rpc.Rpcs;
-import org.nlpcn.jcoder.run.rpc.domain.RpcRequest;
-import org.nlpcn.jcoder.service.TokenService;
-import org.nlpcn.jcoder.util.ApiException;
-import org.nlpcn.jcoder.util.Restful;
-import org.nlpcn.jcoder.util.StaticValue;
-import org.nlpcn.jcoder.util.StringUtil;
-import org.nutz.mvc.ActionContext;
-import org.nutz.mvc.ActionFilter;
-import org.nutz.mvc.View;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TokenFilter implements ActionFilter, RpcFilter {
-
- private static final Logger LOG = LoggerFactory.getLogger(TokenFilter.class);
-
- private boolean def = true;
-
- public TokenFilter(boolean def) {
- this.def = def;
- }
-
- public TokenFilter() {
- }
-
- @Override
- public View match(ActionContext actionContext) {
-
- String token = actionContext.getRequest().getHeader(UserConstants.USER_TOKEN_HEAD);
-
- if (token == null) { //尝试从参数中获取
- token = actionContext.getRequest().getParameter(UserConstants.USER_TOKEN_PARAM);
- }
-
- if (StringUtil.isBlank(token)) {
- LOG.info(StaticValue.getRemoteHost(actionContext.getRequest()) + " token 'authorization' not in header and '_authorization' not in parameters");
- return new JsonView(Restful.instance(false, " token 'authorization' not in header and '_authorization' not in parameters", null, ApiException.TokenAuthorNotFound));
- }
-
- if (def && StaticValue.TOKEN != null && token.equals(StaticValue.TOKEN)) {
- return null;
- }
-
- try {
- Token token2 = TokenService.getToken(token);
- if (token2 == null || token2 == Token.NULL) {
- String message = "token not access";
- if (token.equals(StaticValue.TOKEN)) {
- message += " this api can not visti by default token";
- }
-
- LOG.info(StaticValue.getRemoteHost(actionContext.getRequest()) + " token not access visit " + actionContext.getPath());
- return new JsonView(Restful.instance(false, message, null, ApiException.TokenAuthorNotFound));
- }
-
- String path = actionContext.getPath();
-
- String[] split = path.replace("/api/", "").split("/");
-
-
- if (split.length < 2) {
- split = new String[]{split[0], null};
- }
-
- if (!token2.authorize(split[0], split[1])) {
- return new JsonView(Restful.instance(false, "token not access visit for " + path, null, ApiException.TokenNoPermissions));
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- LOG.error(e.getMessage(), e);
- return new JsonView(Restful.instance(false, e.getMessage(), e, ApiException.ServerException));
- }
-
- return null;
- }
-
- @Override
- public Restful match(RpcRequest req) {
- String token = req.getTokenStr();
-
- if (StringUtil.isBlank(token)) {
- LOG.info(req.getMessageId() + " " + Rpcs.ctx().remoteAddress() + " token 'authorization' not in header and '_authorization' not in parameters");
- return Restful.instance(false, req.getMessageId() + " token 'authorization' not in header and '_authorization' not in parameters", null,
- ApiException.TokenAuthorNotFound);
- }
-
- if (def && StaticValue.TOKEN != null && token.equals(StaticValue.TOKEN)) {
- return null;
- }
-
- try {
- Token token2 = TokenService.getToken(token);
- if (token2 == null || token2 == Token.NULL) {
- String message = "token not access";
- if (token.equals(StaticValue.TOKEN)) {
- message += " this api can not visti by default token";
- }
-
- LOG.info(req.getMessageId() + " " + Rpcs.ctx().remoteAddress() + " token not access visit " + req.getClassName() + "/" + req.getMethodName());
- return Restful.instance(false, message, null, ApiException.TokenAuthorNotFound);
- }
-
- if (!token2.authorize(req.getClassName(), req.getMethodName())) {
- return Restful.instance(false, req.getMessageId() + " token not access visit for " + req.getClassName() + "/" + req.getMethodName(), null,
- ApiException.TokenNoPermissions);
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- LOG.error(e.getMessage(), e);
- return Restful.instance(false, e.getMessage(), e, ApiException.ServerException);
- }
-
- return null;
- }
-
-}
+package org.nlpcn.jcoder.filter;
+
+import java.util.concurrent.ExecutionException;
+
+import org.nlpcn.commons.lang.util.StringUtil;
+import org.nlpcn.jcoder.domain.Token;
+import org.nlpcn.jcoder.run.mvc.view.JsonView;
+import org.nlpcn.jcoder.service.TokenService;
+import org.nlpcn.jcoder.util.ApiException;
+import org.nutz.mvc.ActionContext;
+import org.nutz.mvc.ActionFilter;
+import org.nutz.mvc.View;
+
+public class TokenFilter implements ActionFilter {
+
+ @Override
+ public View match(ActionContext actionContext) {
+ String token = actionContext.getRequest().getHeader("authorization");
+
+ if (StringUtil.isBlank(token)) {
+ return new JsonView(ApiException.Unauthorized, "token 'authorization' not in header ");
+ }
+
+ try {
+ if (TokenService.getToken(token) == Token.NULL) {
+ return new JsonView(ApiException.Unauthorized, "token not access");
+ }
+ } catch (ExecutionException e) {
+ e.printStackTrace();
+ return new JsonView(ApiException.ServerException, e);
+ }
+
+ return null;
+ }
+
+}
diff --git a/src/main/java/org/nlpcn/jcoder/job/BackupJob.java b/src/main/java/org/nlpcn/jcoder/job/BackupJob.java
new file mode 100644
index 0000000..77d2e1b
--- /dev/null
+++ b/src/main/java/org/nlpcn/jcoder/job/BackupJob.java
@@ -0,0 +1,77 @@
+package org.nlpcn.jcoder.job;
+
+import java.io.File;
+import java.util.Date;
+import java.util.List;
+import java.util.OptionalLong;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.log4j.Logger;
+import org.nlpcn.commons.lang.util.IOUtil;
+import org.nlpcn.commons.lang.util.ObjConver;
+import org.nlpcn.jcoder.service.BackupService;
+import org.nlpcn.jcoder.util.DateUtils;
+import org.nlpcn.jcoder.util.StaticValue;
+import org.nutz.ioc.IocException;
+
+/**
+ * 每一个小时进行一次备份
+ *
+ * @author Ansj
+ *
+ */
+public class BackupJob implements Runnable {
+
+ private static final Logger LOG = Logger.getLogger(BackupJob.class);
+
+ @Override
+ public void run() {
+ File backupPath = new File(StaticValue.HOME, "backup");
+
+ if (!backupPath.isFile()) {
+ backupPath.mkdir();
+ }
+
+ while (true) {
+
+ try {
+ try {
+ Thread.sleep(3600000L);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ return;
+ }
+
+ LOG.info("to backup tasks!");
+
+ BackupService backupService = StaticValue.getSystemIoc().get(BackupService.class, "backupService");
+
+ String backup = backupService.backup();
+
+ List list = Stream.of(backupPath.list()).filter(s -> s.replace(".tasks.bak", "").matches("\\d+")).collect(Collectors.toList());
+
+ String timeStamp = DateUtils.formatDate(new Date(), "yyyyMMddHHmmss");
+
+ if (list == null || list.size() == 0) {
+ IOUtil.Writer(new File(backupPath, timeStamp + ".tasks.bak").getAbsolutePath(), "utf-8", backup);
+ continue;
+ }
+
+ OptionalLong max = list.stream().mapToLong(s -> ObjConver.getLong(s.replace(".tasks.bak", ""))).max();
+
+ String content = IOUtil.getContent(new File(backupPath, max.getAsLong() + ".tasks.bak"), "utf-8");
+
+ if (backup.equals(content)) {
+ LOG.info("tasks backup has not change so skip");
+ continue;
+ }
+
+ IOUtil.Writer(new File(backupPath, timeStamp + ".tasks.bak").getAbsolutePath(), "utf-8", backup);
+ } catch (IocException e1) {
+ e1.printStackTrace();
+ }
+
+ }
+ }
+}
diff --git a/src/main/java/org/nlpcn/jcoder/job/CheckDiffJob.java b/src/main/java/org/nlpcn/jcoder/job/CheckDiffJob.java
deleted file mode 100644
index 98d2b5d..0000000
--- a/src/main/java/org/nlpcn/jcoder/job/CheckDiffJob.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.nlpcn.jcoder.job;
-
-import com.google.common.collect.Sets;
-import org.nlpcn.jcoder.domain.Different;
-import org.nlpcn.jcoder.domain.FileInfo;
-import org.nlpcn.jcoder.domain.Group;
-import org.nlpcn.jcoder.domain.GroupCache;
-import org.nlpcn.jcoder.service.FileInfoService;
-import org.nlpcn.jcoder.service.GroupService;
-import org.nlpcn.jcoder.service.SharedSpaceService;
-import org.nlpcn.jcoder.util.StaticValue;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.*;
-
-/**
- * 定时比和主集群做different
- */
-public class CheckDiffJob implements Runnable {
-
-
- private static final Logger LOG = LoggerFactory.getLogger(CheckDiffJob.class);
-
- /**
- * 存储了不同
- */
- private static final Map> DIFF_MAP = new HashMap<>();
-
- /**
- * 只要发现不同就往这里扔
- *
- * @param differents
- */
- public static void addDiff(String groupName, List differents) {
- if (differents == null || differents.size() == 0) {
- return;
- }
- HashSet paths = DIFF_MAP.computeIfAbsent(groupName, (k) -> new HashSet<>());
- for (Different different : differents) {
- paths.add(different.getPath());
- }
- }
-
- @Override
- public void run() {
-
- while (true) {
- long start = System.currentTimeMillis();
- try {
- for (Group group : GroupService.allLocalGroup()) {
- String name = group.getName();
- HashSet paths = DIFF_MAP.get(name);
- if (paths == null || paths.size() == 0) {
- FileInfo root = StaticValue.space().getDataInGroupCache(SharedSpaceService.GROUP_PATH + "/" + name + "/file", FileInfo.class);
- GroupCache groupCache = FileInfoService.getGroupCache(name);
- if (groupCache != null && root != null && root.getMd5().equals(groupCache.getGroupMD5())) {
- LOG.info(name + " file md5 same so skip diff");
- } else {
- StaticValue.space().joinCluster(group);
- }
- } else {
- Set taskNames = null;
- Set relativePaths = null;
- List rm = new ArrayList<>();
- for (String path : paths) {
- if (path.startsWith("/")) {
- relativePaths = Sets.newHashSet(path);
- } else {
- taskNames = Sets.newHashSet(path);
- }
- //TODO:监听到事件的时候理论上缓存已经刷新了。如果发现没刷新再改回来
- List different = StaticValue.space().different(group.getName(), taskNames, relativePaths, false, true);
-
- if (different.size() == 0) {
- rm.add(path);
- } else {
- break;
- }
- }
-
- if (rm.size() > 0) {
- paths.removeAll(rm);
- if (paths.size() == 0) {
- StaticValue.space().joinCluster(group);
- }
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- LOG.info("to run check different end use time {}", (System.currentTimeMillis() - start));
- try {
- Thread.sleep(60 * 1000L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
-
-
- }
- }
-
-}
diff --git a/src/main/java/org/nlpcn/jcoder/job/CheckTaskJob.java b/src/main/java/org/nlpcn/jcoder/job/CheckTaskJob.java
new file mode 100644
index 0000000..c004919
--- /dev/null
+++ b/src/main/java/org/nlpcn/jcoder/job/CheckTaskJob.java
@@ -0,0 +1,32 @@
+package org.nlpcn.jcoder.job;
+
+import org.apache.log4j.Logger;
+import org.nlpcn.jcoder.service.TaskService;
+import org.nlpcn.jcoder.util.StaticValue;
+
+/**
+ * 定期检查集群运行情况。只有master可以
+ *
+ * @author ansj
+ */
+public class CheckTaskJob implements Runnable {
+
+ private static final Logger LOG = Logger.getLogger(CheckTaskJob.class);
+
+ @Override
+ public void run() {
+
+ TaskService taskService = StaticValue.getBean(TaskService.class, "taskService");
+
+ while (true) {
+ try {
+ Thread.sleep(60000L);
+ LOG.debug("begin checkTaskJob");
+ taskService.checkAllTask();
+ } catch (Exception e) {
+ e.printStackTrace();
+ LOG.error(e);
+ }
+ }
+ }
+}
diff --git a/src/main/java/org/nlpcn/jcoder/job/LogJob.java b/src/main/java/org/nlpcn/jcoder/job/LogJob.java
deleted file mode 100644
index 89e849c..0000000
--- a/src/main/java/org/nlpcn/jcoder/job/LogJob.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.nlpcn.jcoder.job;
-
-import com.alibaba.fastjson.JSONObject;
-
-import org.nlpcn.jcoder.domain.LogInfo;
-import org.nlpcn.jcoder.util.StaticValue;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.ArrayBlockingQueue;
-
-import static org.nlpcn.jcoder.constant.Constants.LOG_ROOM;
-
-/**
- * 日志处理的定时任务。所有机器运行
- * Created by Ansj on 05/02/2018.
- */
-public class LogJob implements Runnable {
-
- private static final Logger LOG = LoggerFactory.getLogger(LogJob.class);
-
- private static final ArrayBlockingQueue QUEUE = new ArrayBlockingQueue(100000);
-
- private static final int MAX = 100000;
-
- @Override
- public void run() {
-
- String message = null;
-
- while (true) {
- try {
-
- LogInfo logInfo = QUEUE.poll();
-
- if (logInfo == null) {
- Thread.sleep(10L);
- continue;
- }
-
-
- String logJson = JSONObject.toJSONString(logInfo);
-
- if (logInfo.getGroupName() != null) {
- //发送到group日志房间
- StaticValue.space().getRoomService().sendMessage(LOG_ROOM + "_" + logInfo.getGroupName(), logJson);
- } else {
- StaticValue.space().getRoomService().sendMessage(LOG_ROOM, logJson);
- }
-
- //进行日志统计分析
- StatisticalJob.add(logInfo);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- }
-
- /**
- * 增加一个元素到队列
- */
- public static void add(LogInfo logInfo) {
- QUEUE.offer(logInfo);
- }
-}
diff --git a/src/main/java/org/nlpcn/jcoder/job/MasterCleanTokenJob.java b/src/main/java/org/nlpcn/jcoder/job/MasterCleanTokenJob.java
deleted file mode 100644
index 04e38bd..0000000
--- a/src/main/java/org/nlpcn/jcoder/job/MasterCleanTokenJob.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.nlpcn.jcoder.job;
-
-import org.nlpcn.jcoder.domain.Token;
-import org.nlpcn.jcoder.util.StaticValue;
-import org.nlpcn.jcoder.util.ZKMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Map;
-
-/**
- * 定期清除过期的token
- * Created by Ansj on 29/01/2018.
- */
-public class MasterCleanTokenJob implements Runnable {
-
- private static final Logger LOG = LoggerFactory.getLogger(MasterCleanTokenJob.class);
-
- private static Thread thread = null;
-
- private MasterCleanTokenJob() {
- }
-
- /**
- * 当竞选为master时候调用此方法
- */
- public synchronized static void startJob() {
- stopJob();
- thread = new Thread(new MasterCleanTokenJob());
- thread.start();
- }
-
- /**
- * 当失去master时候调用此方法
- */
- public synchronized static void stopJob() {
- if (thread != null) {
- try {
- thread.interrupt();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- thread = null;
- }
-
- @Override
- public void run() {
-
- LOG.info("I am master so to start master job clean token");
-
- /**
- * 监听任务变化
- */
- while (StaticValue.isMaster()) {
- try {
- ZKMap tokenCache = StaticValue.space().getTokenCache();
-
- Map stringTokenMap = tokenCache.toMap();
-
- for (Map.Entry entry : stringTokenMap.entrySet()) {
- if (entry.getValue().getExpirationTime().getTime() < System.currentTimeMillis() - 600000) { //过期10分钟的清除。防止服务器时间不太同步
- tokenCache.remove(entry.getKey());
- }
- }
-
- Thread.sleep(300000L); //5分钟执行一次
-
- } catch (Exception e) {
- e.printStackTrace();
- try {
- Thread.sleep(1000L);
- } catch (InterruptedException e1) {
- e1.printStackTrace();
- }
- }
- }
-
- }
-
-
-}
diff --git a/src/main/java/org/nlpcn/jcoder/job/MasterRunTaskJob.java b/src/main/java/org/nlpcn/jcoder/job/MasterRunTaskJob.java
deleted file mode 100644
index 4d59edf..0000000
--- a/src/main/java/org/nlpcn/jcoder/job/MasterRunTaskJob.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.nlpcn.jcoder.job;
-
-import com.google.common.collect.ImmutableMap;
-import org.nlpcn.jcoder.constant.Api;
-import org.nlpcn.jcoder.domain.KeyValue;
-import org.nlpcn.jcoder.service.GroupService;
-import org.nlpcn.jcoder.service.ProxyService;
-import org.nlpcn.jcoder.util.StaticValue;
-import org.nlpcn.jcoder.util.StringUtil;
-import org.nutz.http.Response;
-import org.quartz.SchedulerException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
-/**
- * master 发布job
- */
-public class MasterRunTaskJob implements Runnable {
-
- private static final Logger LOG = LoggerFactory.getLogger(MasterRunTaskJob.class);
-
- private static BlockingQueue> TASK_QUEUE = new LinkedBlockingQueue<>();
-
- private static Thread thread = null;
-
- private MasterRunTaskJob() {
- }
-
- /**
- * 当竞选为master时候调用此方法
- */
- public synchronized static void startJob() {
- stopJob();
- thread = new Thread(new MasterRunTaskJob());
- thread.start();
- }
-
- /**
- * 当失去master时候调用此方法
- */
- public synchronized static void stopJob(){
- if (thread != null) {
- try {
- thread.interrupt();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- TASK_QUEUE.clear();
- thread = null;
- }
-
- /**
- * 发布一个task到任务队列
- */
- public static void addQueue(KeyValue kv) {
- TASK_QUEUE.add(kv);
- }
-
- @Override
- public void run() {
-
- ProxyService proxyService = StaticValue.getSystemIoc().get(ProxyService.class, "proxyService");
-
- GroupService groupService = StaticValue.getSystemIoc().get(GroupService.class, "groupService");
-
-
- LOG.info("I am master so to start master job");
-
- /**
- * 监听任务变化
- */
- while (StaticValue.isMaster()) {
- try {
- try {
- KeyValue groupTask = TASK_QUEUE.poll(Integer.MAX_VALUE, TimeUnit.DAYS);
- LOG.info("publish " + groupTask);
- String hostPort = groupService.getRandomCurrentHostPort(groupTask.getKey());
- if (StringUtil.isBlank(hostPort)) {
- LOG.warn(groupTask + " not found any current hostport");
- continue;
- }
- Response post = proxyService.post(hostPort, Api.TASK_CRON.getPath(), ImmutableMap.of("groupName", groupTask.getKey(), "taskName", groupTask.getValue()), 1000);
- if (post.getStatus() == 200) {
- LOG.info(groupTask + " publish ok result : " + post.getContent());
- } else {
- LOG.error("{} publish fail status : {} result : {}", groupTask, post.getStatus(), post.getContent());
- }
- } catch (InterruptedException e) {
- e.printStackTrace();
- break;
- }
- } catch (Exception e) {
- e.printStackTrace();
- try {
- Thread.sleep(1000L);
- } catch (InterruptedException e1) {
- e1.printStackTrace();
- }
- }
- }
-
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/org/nlpcn/jcoder/job/MasterTaskCheckJob.java b/src/main/java/org/nlpcn/jcoder/job/MasterTaskCheckJob.java
deleted file mode 100644
index 30da1fb..0000000
--- a/src/main/java/org/nlpcn/jcoder/job/MasterTaskCheckJob.java
+++ /dev/null
@@ -1,306 +0,0 @@
-package org.nlpcn.jcoder.job;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.google.common.collect.ImmutableMap;
-import org.apache.curator.framework.recipes.cache.TreeCacheEvent.Type;
-import org.nlpcn.jcoder.constant.Api;
-import org.nlpcn.jcoder.constant.Constants;
-import org.nlpcn.jcoder.domain.*;
-import org.nlpcn.jcoder.scheduler.QuartzSchedulerManager;
-import org.nlpcn.jcoder.service.GroupService;
-import org.nlpcn.jcoder.service.ProxyService;
-import org.nlpcn.jcoder.service.SharedSpaceService;
-import org.nlpcn.jcoder.util.MapCount;
-import org.nlpcn.jcoder.util.StaticValue;
-import org.nlpcn.jcoder.util.ZKMap;
-import org.nutz.http.Response;
-import org.quartz.SchedulerException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.*;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-public class MasterTaskCheckJob implements Runnable {
-
- private static final Logger LOG = LoggerFactory.getLogger(MasterTaskCheckJob.class);
-
- private static final BlockingQueue HANDLER_QUEUE = new LinkedBlockingQueue<>();
-
-
- private static Thread thread;
-
- private List taskInfos;
-
- private ProxyService proxyService;
-
- private GroupService groupService;
-
- private MasterTaskCheckJob() {
- }
-
- /**
- * 当竞选为master时候调用此方法
- */
- public synchronized static void startJob() {
- stopJob();
- thread = new Thread(new MasterTaskCheckJob());
- thread.start();
- }
-
- /**
- * 当失去master时候调用此方法
- */
- public synchronized static void stopJob() {
- if (thread != null) {
- try {
- thread.interrupt();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- HANDLER_QUEUE.clear();
- thread = null;
- }
-
- /**
- * 发布一个监听任务
- */
- public static void addQueue(Handler handler) {
- HANDLER_QUEUE.add(handler);
- }
-
- @Override
- public void run() {
-
- proxyService = StaticValue.getSystemIoc().get(ProxyService.class, "proxyService");
-
- groupService = StaticValue.getSystemIoc().get(GroupService.class, "groupService");
-
- /**
- * 监听任务变化
- */
- while (StaticValue.isMaster()) {
- try {
- try {
- Handler handler = HANDLER_QUEUE.poll(60, TimeUnit.SECONDS);
-
- if (handler != null) {
- if (handler.getAction() == Type.NODE_REMOVED) {
- QuartzSchedulerManager.removeJob(handler.getGroupName(), handler.getTaskName());
- } else if (handler.getAction() == Type.NODE_ADDED || handler.getAction() == Type.NODE_UPDATED) {
- Task task = StaticValue.space().getDataInGroupCache(handler.getPath(), Task.class);
- QuartzSchedulerManager.removeJob(handler.getGroupName(), handler.getTaskName());
- if (task.getType() == 2 && task.getStatus() == 1) {
- QuartzSchedulerManager.addJob(task.getGroupName(), task.getName(), task.getScheduleStr());
- }
- }
-
- } else {
- //从 current 获取全部task，增加到定时任务,启动定时器
- List cTasks = new ArrayList<>();
-
- StaticValue.space().getGroupCache().getCurrentChildren(SharedSpaceService.GROUP_PATH).keySet().forEach(gp -> {
- StaticValue.space().getGroupCache().getCurrentChildren(SharedSpaceService.GROUP_PATH + "/" + gp).entrySet().forEach(e -> {
- if (!"file".equals(e.getKey())) {
- Task task = JSONObject.parseObject(e.getValue().getData(), Task.class);
- if (task.getType() == 2 && task.getStatus() == 1) {
- cTasks.add(task);
- }
- }
- });
- });
-
-
- Set allScheduler = QuartzSchedulerManager.jobList().stream().map(j -> j.getName()).collect(Collectors.toSet()); // 现在所有的定时计划
-
- //获取集群中所有的定时任务
- findAllRuningJob();
-
- /**
- * 初始化所有定时任务
- */
- cTasks.forEach(task -> {
- try {
- String scheduleStr = task.getScheduleStr();
- if ("while".equals(scheduleStr)) {
- checkWhileJob(task);
- } else if ("all".equals(scheduleStr)) {
- checkAllJob(task);
- } else {
- String key = task.getGroupName() + "@" + task.getName();
- allScheduler.remove(key);
- if (!QuartzSchedulerManager.checkExists(key)) {
- if (QuartzSchedulerManager.addJob(task.getGroupName(), task.getName(), task.getScheduleStr())) {
- LOG.info("regedit ok ! cornStr : " + task.getScheduleStr());
- } else {
- LOG.error("regedit fail ! cornStr : " + task.getScheduleStr());
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- });
-
-
- /**
- * 对于规划外的定时任务移除
- */
- if (allScheduler.size() > 0) {
- allScheduler.stream().forEach(groupTaskName -> {
- String[] split = groupTaskName.split(Constants.GROUP_TASK_SPLIT);
- try {
- QuartzSchedulerManager.removeJob(split[0], split[1]);
- } catch (SchedulerException e) {
- e.printStackTrace();
- }
- });
- }
-
-
- //查找所有机器的定时任务 发现没有在定时计划中的发送停止请求
- stopOutsideJob();
- }
-
-
- } catch (InterruptedException e) {
- e.printStackTrace();
- break;
- }
- } catch (Exception e) {
- e.printStackTrace();
- try {
- Thread.sleep(1000L);
- } catch (InterruptedException e1) {
- e1.printStackTrace();
- }
- }
- }
-
- }
-
- private void stopOutsideJob() {
- //如果单机模式则废止
- if (StaticValue.IS_LOCAL) {
- return;
- }
-
- //检查非同步状态的机器如果有定时任务就停止
- ZKMap hostGroupCache = StaticValue.space().getHostGroupCache();
-
- /**
- * 停止为同步状态机上的任务
- */
- taskInfos.parallelStream().forEach(t -> {
- HostGroup hostGroup = hostGroupCache.get(t.getHostPort() + "_" + t.getGroupName());
- if (hostGroup != null && !hostGroup.isCurrent()) {
- stopTask(t.getHostPort(), t.getGroupName(), t.getTaskName());
- }
-
- });
- }
-
-
- /**
- * 检查all的task
- */
- private void checkAllJob(Task task) {
-
- Set currentHostPort = null;
-
- if (StaticValue.IS_LOCAL) {
- currentHostPort = new HashSet<>();
- currentHostPort.add(StaticValue.getHostPort());
- } else {
- //获得所有有这个group的同步机器
- currentHostPort = new HashSet<>(groupService.getCurrentHostPort(task.getGroupName()));
- }
-
- MapCount mc = new MapCount<>();
- for (TaskInfo taskInfo : taskInfos) {
- if (taskInfo.getGroupName().equals(task.getGroupName()) && taskInfo.getTaskName().equals(task.getName())) {
- mc.add(taskInfo.getHostPort());
- }
- }
-
- for (Map.Entry entry : mc.get().entrySet()) {
- if (entry.getValue() == 1) {
- currentHostPort.remove(entry.getKey());
- } else {
- stopTask(entry.getKey(), task.getGroupName(), task.getName());
- }
- }
-
- for (String hostPort : currentHostPort) {
- startTask(hostPort, task.getGroupName(), task.getName());
- }
-
- }
-
- /**
- * 检查while的定时任务。必须有且只有一个存在
- */
- private void checkWhileJob(Task task) {
- boolean have = false;
-
- for (TaskInfo t : taskInfos) {
- if (t.getTaskName().equals(task.getName()) && t.getGroupName().equals(task.getGroupName())) {
- if (have) {//已经有了stop掉
- stopTask(t.getHostPort(), t.getGroupName(), t.getTaskName());
- } else {
- have = true;
- }
- }
- }
-
- if (!have) {
- MasterRunTaskJob.addQueue(KeyValue.with(task.getGroupName(), task.getName()));
- }
-
- }
-
- /**
- * 停止某个机器的定时任务
- */
- private void stopTask(String hostPort, String groupName, String taskName) {
- LOG.info("to stop task {}/{} in host {}", groupName, taskName, hostPort);
-
- try {
- proxyService.post(hostPort, "/admin/thread/stopAllJob", ImmutableMap.of("groupName", groupName, "taskName", taskName), 1000);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- private void startTask(String hostPort, String groupName, String taskName) {
- LOG.info("to start task {}/{} in host {}", groupName, taskName, hostPort);
- try {
- Response post = proxyService.post(hostPort, Api.TASK_CRON.getPath(), ImmutableMap.of("groupName", groupName, "taskName", taskName), 1000);
- if (post.getStatus() == 200) {
- LOG.info("{}/{} publish ok result : " + post.getContent(), groupName, taskName);
- } else {
- LOG.error("{}/{} publish fail status : {} result : {}", groupName, taskName, post.getStatus(), post.getContent());
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 获取所有机器运行中的任务
- */
- private void findAllRuningJob() throws Exception {
-
- Response post = proxyService.post(StaticValue.getHostPort(), "/admin/thread/list", ImmutableMap.of("type", "threads"), 10000);
-
- JSONArray jar = JSONObject.parseObject(post.getContent()).getJSONObject("obj").getJSONArray("threads");
-
- taskInfos = jar.toJavaList(TaskInfo.class);
- }
-
-}
diff --git a/src/main/java/org/nlpcn/jcoder/job/PrintConsoleJob.java b/src/main/java/org/nlpcn/jcoder/job/PrintConsoleJob.java
new file mode 100644
index 0000000..a469328
--- /dev/null
+++ b/src/main/java/org/nlpcn/jcoder/job/PrintConsoleJob.java
@@ -0,0 +1,64 @@
+package org.nlpcn.jcoder.job;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+
+import org.apache.log4j.Logger;
+import org.nlpcn.commons.lang.util.IOUtil;
+import org.nlpcn.commons.lang.util.StringUtil;
+import org.nlpcn.jcoder.util.StaticValue;
+import org.nlpcn.jcoder.webscoket.WebSocketConsole;
+
+public class PrintConsoleJob implements Runnable {
+
+ private static final Logger LOG = Logger.getLogger(PrintConsoleJob.class);
+
+ private int count = 0;
+
+ @Override
+ public void run() {
+ File file = new File(StaticValue.LOG_PATH);
+ while (true) {
+ try {
+ if (WebSocketConsole.count() > 0 && file.exists()) {
+ try (FileInputStream fis = new FileInputStream(file)) {
+ long length = file.length() - 5000;
+ fis.skip(length <= 0 ? 0 : length);
+ try (BufferedReader br = IOUtil.getReader(fis, "utf-8")) {
+
+ String line = null;
+ while (WebSocketConsole.count() > 0) {
+ line = br.readLine();
+
+ if (count++ > 1000) {
+ LOG.debug("read about 100 times for log !");
+ count = 0;
+ }
+
+ if (StringUtil.isBlank(line)) {
+ Thread.sleep(1000L);
+ } else {
+ WebSocketConsole.sendMessage(line);
+ }
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ WebSocketConsole.sendMessage(e.getMessage());
+ }
+ }
+ }
+ if (count++ > 60) {
+ LOG.debug("no connect ! wait for client conn!");
+ count = 0;
+ }
+
+ Thread.sleep(1000);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+}
diff --git a/src/main/java/org/nlpcn/jcoder/job/RunTaskJob.java b/src/main/java/org/nlpcn/jcoder/job/RunTaskJob.java
new file mode 100644
index 0000000..e2989f5
--- /dev/null
+++ b/src/main/java/org/nlpcn/jcoder/job/RunTaskJob.java
@@ -0,0 +1,43 @@
+package org.nlpcn.jcoder.job;
+
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.log4j.Logger;
+import org.nlpcn.commons.lang.util.StringUtil;
+import org.nlpcn.jcoder.domain.Task;
+import org.nlpcn.jcoder.scheduler.ThreadManager;
+import org.nlpcn.jcoder.service.TaskService;
+import org.nlpcn.jcoder.util.SharedSpace;
+
+public class RunTaskJob implements Runnable {
+
+ private static final Logger LOG = Logger.getLogger(RunTaskJob.class);
+
+ @Override
+ public void run() {
+ LinkedBlockingQueue taskQueue = SharedSpace.getTaskQueue() ;
+ while (true) {
+ try {
+ String taskName = taskQueue.poll(Integer.MAX_VALUE,TimeUnit.DAYS);
+ if (StringUtil.isNotBlank(taskName)) {
+ LOG.info("get " + taskName + " to task_quene ! wil be run!");
+ Task task = TaskService.findTaskByCache(taskName);
+ if (task == null) {
+ LOG.error("task " + taskName + " is not found in task cache!");
+ } else if (task.getStatus() == 0) {
+ LOG.error("task " + taskName + " status is 0 so skip !");
+ } else {
+ ThreadManager.run(task);
+ }
+ }
+ Thread.sleep(50L);
+ } catch (Exception e) {
+ e.printStackTrace();
+ LOG.error(e);
+ }
+ }
+
+ }
+
+}
diff --git a/src/main/java/org/nlpcn/jcoder/job/SiteSetup.java b/src/main/java/org/nlpcn/jcoder/job/SiteSetup.java
index 65e6ab4..1f1e482 100644
--- a/src/main/java/org/nlpcn/jcoder/job/SiteSetup.java
+++ b/src/main/java/org/nlpcn/jcoder/job/SiteSetup.java
@@ -1,170 +1,87 @@
-package org.nlpcn.jcoder.job;
-
-import org.eclipse.jetty.webapp.WebAppContext;
-import org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainerInitializer;
-import org.nlpcn.jcoder.run.rpc.websocket.ApiWebsocket;
-import org.nlpcn.jcoder.run.rpc.websocket.LogWebsocket;
-import org.nlpcn.jcoder.server.H2Server;
-import org.nlpcn.jcoder.server.ZKServer;
-import org.nlpcn.jcoder.service.GroupService;
-import org.nlpcn.jcoder.service.JarService;
-import org.nlpcn.jcoder.service.ProxyService;
-import org.nlpcn.jcoder.service.SharedSpaceService;
-import org.nlpcn.jcoder.util.GroupFileListener;
-import org.nlpcn.jcoder.util.Maps;
-import org.nlpcn.jcoder.util.Restful;
-import org.nlpcn.jcoder.util.StaticValue;
-import org.nutz.http.Response;
-import org.nutz.mvc.NutConfig;
-import org.nutz.mvc.Setup;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.ServletException;
-import javax.websocket.DeploymentException;
-import javax.websocket.server.ServerContainer;
-
-public class SiteSetup implements Setup {
-
- private static final Logger LOG = LoggerFactory.getLogger(SiteSetup.class);
-
- @Override
- public void destroy(NutConfig nc) {
- try {
- StaticValue.space().release();
- } catch (Exception e) {
- e.printStackTrace();
- }
- ;
- H2Server.stopServer();
- }
-
- @Override
- public void init(NutConfig nc) {
-
- LOG.info("init begin ! ");
- // 设置ioc
- StaticValue.setSystemIoc(nc.getIoc());
-
- checkServer();
-
- H2Server.startServer(nc);
-
- // set version
- nc.getServletContext().setAttribute("VERSION", StaticValue.VERSION);
-
- /**
- * 初始化集群记录
- */
- if (StaticValue.IS_LOCAL) {
- LOG.info("stared server by local model");
- ZKServer.startServer();
- StaticValue.setMaster(true);
- } else {
- LOG.info("stared server by cluster model");
- StaticValue.setMaster(false);
- }
-
- try {
- Thread.sleep(1000L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- LOG.error(e.getMessage(), e);
- }
-
- try {
- StaticValue.setSharedSpace(new SharedSpaceService().init());
- } catch (Exception e) {
- LOG.error("zookpeer err ", e);
- System.exit(-1);
- }
-
- //加載所有的group
- GroupService.allLocalGroup().forEach(g -> { //并监听
- JarService.getOrCreate(g.getName());
- if (StaticValue.TESTRING) {
- GroupFileListener.unRegediter(g.getName());
- GroupFileListener.regediter(g.getName());
- }
- });
-
-
- new Thread(new CheckDiffJob()).start();
-
- //开启日志监控
- new Thread(new LogJob()).start();
-
- // 开启API访问日志统计
- new Thread(new StatisticalJob()).start();
-
- //init webscoket
- WebAppContext.Context ct = (WebAppContext.Context) nc.getServletContext();
- WebAppContext webAppContext = (WebAppContext) ct.getContextHandler();
- try {
- ServerContainer configureContext = configureContext = WebSocketServerContainerInitializer.configureContext(webAppContext);
- configureContext.addEndpoint((Class) ApiWebsocket.class);
- configureContext.addEndpoint((Class) LogWebsocket.class);
- } catch (ServletException e) {
- e.printStackTrace();
- } catch (DeploymentException e) {
- e.printStackTrace();
- }
-
-
- if (!StaticValue.IS_LOCAL) { //验证host 及 port是否配置正确
- new Thread() {
- @Override
- public void run() {
- Response response = null ;
- for (int i = 0; i < 10; i++) {
- try {
- Thread.sleep(5000L);
-
- LOG.info("times: {} , to check host port is right host:port:{}", (i + 1), StaticValue.getHostPort());
- response = StaticValue.getSystemIoc().get(ProxyService.class,"proxyService").post(StaticValue.getHostPort(), "/apidoc/validate", Maps.hash("code", StaticValue.RANDOM_CODE), 1000);
- if (response.getStatus() == 200) {
- Restful instance = Restful.instance(response);
- Boolean obj = instance.getObj();
- if (obj) {
- LOG.info("validate code ok the host or port is right");
- } else {
- LOG.info("validate code fail , please check you host and port is right ? now stop service");
- System.exit(-1);
- }
- break ;
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- }
-
- if(response==null) {
- LOG.error("not visit {} , please check you host and port is right ? now stop service", StaticValue.getHostPort());
- System.exit(-1);
- }
-
- }
- }.start();
- }
-
-
- LOG.info("start all ok , goodluck YouYou");
-
- }
-
- /**
- * 检查机器是否可以运行
- */
- private void checkServer() {
- if (!StaticValue.IS_LOCAL) {
- if ("127.0.0.1".equals(StaticValue.getHost())
- || "localhost".equals(StaticValue.getHost())) {
- LOG.error("cluster model must set host by LAN IP or domain");
- System.exit(-1);
- }
- }
- }
-
-}
+package org.nlpcn.jcoder.job;
+
+import org.apache.log4j.Logger;
+import org.nlpcn.jcoder.scheduler.TaskException;
+import org.nlpcn.jcoder.server.H2Server;
+import org.nlpcn.jcoder.server.rpc.server.RpcServer;
+import org.nlpcn.jcoder.service.JarService;
+import org.nlpcn.jcoder.service.TaskService;
+import org.nlpcn.jcoder.util.StaticValue;
+import org.nutz.ioc.IocException;
+import org.nutz.mvc.NutConfig;
+import org.nutz.mvc.Setup;
+
+public class SiteSetup implements Setup {
+
+ private static final Logger LOG = Logger.getLogger(SiteSetup.class);
+
+ @Override
+ public void destroy(NutConfig nc) {
+ H2Server.stopServer();
+ RpcServer.stopServer();
+ }
+
+ @Override
+ public void init(NutConfig nc) {
+
+ LOG.info("init begin ! ");
+ // 设置ioc
+
+ StaticValue.setSystemIoc(nc.getIoc());
+
+ H2Server.startServer(nc);
+
+ // set version
+ nc.getServletContext().setAttribute("VERSION", StaticValue.VERSION);
+
+ // 初始化Jar环境
+ LOG.info("begin Jar init!");
+ JarService.init();
+
+ try {
+ LOG.info("begin init all task by db !");
+ nc.getIoc().get(TaskService.class, "taskService").initTaskFromDB();
+ LOG.info("begin init all task ok !");
+ } catch (IocException | TaskException e) {
+ e.printStackTrace();
+ LOG.error(e);
+ System.exit(-1);
+ }
+
+ try {
+ Thread.sleep(1000L);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ LOG.error(e);
+ }
+
+ // task 其他定时任务的运行状况
+ new Thread(new CheckTaskJob()).start();
+
+ LOG.info("begin run task quene!");
+ // 运行队列
+ new Thread(new RunTaskJob()).start();
+
+ LOG.info("begin print console job!");
+ // 运行日志打印到websocket任务
+ new Thread(new PrintConsoleJob()).start();
+
+ //定时备份代码
+ new Thread(new BackupJob()).start();
+
+ // 启动rpc服务,默认是当前端口+1 ;
+ LOG.info("begin start rpc server! on port " + StaticValue.RPCPORT);
+ try {
+ RpcServer.startServer(StaticValue.RPCPORT);
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ LOG.error(StaticValue.PREFIX + "port not set in system property");
+ } catch (Exception e) {
+ LOG.error("rpc server stop fail ", e);
+ }
+
+ LOG.info("start all ok , goodluck");
+
+ }
+
+}
diff --git a/src/main/java/org/nlpcn/jcoder/job/StatisticalJob.java b/src/main/java/org/nlpcn/jcoder/job/StatisticalJob.java
deleted file mode 100644
index 7fbd6bc..0000000
--- a/src/main/java/org/nlpcn/jcoder/job/StatisticalJob.java
+++ /dev/null
@@ -1,241 +0,0 @@
-package org.nlpcn.jcoder.job;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.google.common.base.Strings;
-import org.nlpcn.jcoder.domain.LogInfo;
-import org.nlpcn.jcoder.service.SharedSpaceService;
-import org.nlpcn.jcoder.util.StaticValue;
-import org.nlpcn.jcoder.util.StringUtil;
-import org.nutz.lang.Lang;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.time.LocalDateTime;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Stream;
-
-/**
- * 统计任务，定时生成。报告
- * Created by Ansj on 05/02/2018.
- */
-public class StatisticalJob implements Runnable {
-
- private static final Logger LOG = LoggerFactory.getLogger(StatisticalJob.class);
-
- private static final Map STATS_CACHE = new ConcurrentHashMap<>();
-
- @Override
- public void run() {
- while (true) {
- try {
- Stream.of(STATS_CACHE.keySet().toArray(new String[0])).forEach(key -> STATS_CACHE.compute(key, (k, stats) -> {
- appendStats2ZK(k, stats);
-
- // 移除数据
- return null;
- }));
-
- TimeUnit.MINUTES.sleep(1);
- } catch (Exception e) {
- LOG.error("run stats job error", e);
- }
- }
- }
-
- /**
- * 将日志统计信息放入ZK, 存储结构: jcoder <- log_stats <- 年月日 <- 主机 <- (时分 ------- 日志统计信息)
- *
- * @param key 格式: 年月日/时分/group/class/method
- * @param stats 日志统计信息
- */
- private void appendStats2ZK(String key, Stats stats) {
- // 追加数据
- int i, len = key.length();
- for (i = 0; i < len; ++i) {
- if (key.charAt(i) == '/') {
- break;
- }
- }
- int j = i + 1;
- for (; j < len; ++j) {
- if (key.charAt(j) == '/') {
- break;
- }
- }
- String path = String.format("%s/%s/%s/%s",
- SharedSpaceService.LOG_STATS_PATH,
- key.substring(0, i),
- StaticValue.getHostPort(),
- key.substring(i + 1, j));
- JSONObject data = null;
- try {
- if (StaticValue.space().getZk().checkExists().forPath(path) != null) {
- // 同一分钟的日志进行合并
- byte[] bytes = StaticValue.space().getData2ZK(path);
- if (bytes != null && 0 < bytes.length) {
- (data = JSONObject.parseObject(bytes, JSONObject.class)).merge(key.substring(j + 1), stats, (o, n) -> {
- Stats s = JSON.toJavaObject((JSONObject) o, Stats.class);
- s.merge((Stats) n);
- return s;
- });
- }
- }
- if (data == null) {
- data = new JSONObject();
- data.put(key.substring(j + 1), stats);
- }
- StaticValue.space().setData2ZK(path, JSON.toJSONBytes(data));
- } catch (Exception e) {
- throw Lang.wrapThrow(e, "append stats[%s-%s] to zookeeper error", key, data);
- }
- }
-
- /**
- * 对日志信息做统计
- *
- * @param log 日志信息
- */
- public static void add(LogInfo log) {
- if (StringUtil.isBlank(log.getGroupName()) || StringUtil.isBlank(log.getClassName()) || StringUtil.isBlank(log.getMethodName())) {
- if (LOG.isDebugEnabled()) {
- LOG.warn("groupName or className or methodName not found");
- }
- return;
- }
- String message = log.getMessage();
- if (StringUtil.isBlank(message)) {
- LOG.warn("empty log message");
- return;
- }
-
- //
- Stats stats;
- int duration;
- if (message.startsWith("Execute OK")) {
- // Execute OK ApiTest/test succesed ! use Time : 0
- (stats = new Stats()).successCount.set(1);
- duration = Integer.parseInt(StringUtil.subString(message, " succesed ! use Time : ", null).trim());
- } else if (message.startsWith("Execute ERR")) {
- // Execute ERR ApiTest/test useTime 0 erred : java.lang.reflect.InvocationTargetException...
- (stats = new Stats()).errorCount.set(1);
- duration = Integer.parseInt(StringUtil.subString(message, " useTime ", " erred : ").trim());
- } else {
- // 忽略其他日志信息
- return;
- }
-
- // 最小耗时
- stats.minDuration.set(duration);
-
- // 最大耗时
- stats.maxDuration.set(duration);
-
- // 总耗时
- stats.totalDuration.set(duration);
-
- // 格式: 年月日/时分/group/class/method
- LocalDateTime time = LocalDateTime.now();
- String key = String.format("%s%s%s/%s%s/%s/%s/%s",
- time.getYear(),
- Strings.padStart(String.valueOf(time.getMonthValue()), 2, '0'),
- Strings.padStart(String.valueOf(time.getDayOfMonth()), 2, '0'),
- Strings.padStart(String.valueOf(time.getHour()), 2, '0'),
- Strings.padStart(String.valueOf(time.getMinute()), 2, '0'),
- log.getGroupName(),
- log.getClassName(),
- log.getMethodName());
- STATS_CACHE.merge(key, stats, Stats::merge);
- }
-
- public static class Stats {
- private final AtomicInteger successCount = new AtomicInteger();
- private final AtomicInteger errorCount = new AtomicInteger();
- private final AtomicInteger minDuration = new AtomicInteger();
- private final AtomicInteger maxDuration = new AtomicInteger();
- private final AtomicInteger totalDuration = new AtomicInteger();
-
- private String groupName;
- private String className;
- private String methodName;
-
- public Stats merge(Stats stats) {
- successCount.addAndGet(stats.successCount.get());
- errorCount.addAndGet(stats.errorCount.get());
- minDuration.updateAndGet(operand -> {
- int d = stats.minDuration.get();
- return d == 0 && operand != 0 ? operand : d != 0 && operand == 0 ? d : Math.min(operand, d);
- });
- maxDuration.updateAndGet(operand -> Math.max(operand, stats.maxDuration.get()));
- totalDuration.addAndGet(stats.totalDuration.get());
- return this;
- }
-
- public int getSuccessCount() {
- return successCount.get();
- }
-
- public void setSuccessCount(int successCount) {
- this.successCount.set(successCount);
- }
-
- public int getErrorCount() {
- return errorCount.get();
- }
-
- public void setErrorCount(int errorCount) {
- this.errorCount.set(errorCount);
- }
-
- public int getMinDuration() {
- return minDuration.get();
- }
-
- public void setMinDuration(int minDuration) {
- this.minDuration.set(minDuration);
- }
-
- public int getMaxDuration() {
- return maxDuration.get();
- }
-
- public void setMaxDuration(int maxDuration) {
- this.maxDuration.set(maxDuration);
- }
-
- public int getTotalDuration() {
- return totalDuration.get();
- }
-
- public void setTotalDuration(int totalDuration) {
- this.totalDuration.set(totalDuration);
- }
-
- public String getGroupName() {
- return groupName;
- }
-
- public void setGroupName(String groupName) {
- this.groupName = groupName;
- }
-
- public String getClassName() {
- return className;
- }
-
- public void setClassName(String className) {
- this.className = className;
- }
-
- public String getMethodName() {
- return methodName;
- }
-
- public void setMethodName(String methodName) {
- this.methodName = methodName;
- }
- }
-}
diff --git a/src/main/java/org/nlpcn/jcoder/run/CodeException.java b/src/main/java/org/nlpcn/jcoder/run/CodeException.java
index 506065b..fc6be5f 100644
--- a/src/main/java/org/nlpcn/jcoder/run/CodeException.java
+++ b/src/main/java/org/nlpcn/jcoder/run/CodeException.java
@@ -2,11 +2,6 @@
public class CodeException extends Exception {
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
public CodeException(String string) {
super(string);
}
@@ -15,4 +10,9 @@ public CodeException(Exception e) {
super(e);
}
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
}
diff --git a/src/main/java/org/nlpcn/jcoder/run/CodeRuntimeException.java b/src/main/java/org/nlpcn/jcoder/run/CodeRuntimeException.java
index 20ab0c2..228b356 100644
--- a/src/main/java/org/nlpcn/jcoder/run/CodeRuntimeException.java
+++ b/src/main/java/org/nlpcn/jcoder/run/CodeRuntimeException.java
@@ -2,17 +2,17 @@
public class CodeRuntimeException extends RuntimeException {
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
public CodeRuntimeException(String string) {
super(string);
}
-
- public CodeRuntimeException(Throwable e) {
+
+ public CodeRuntimeException(Exception e){
super(e);
}
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
}
diff --git a/src/main/java/org/nlpcn/jcoder/run/annotation/Cache.java b/src/main/java/org/nlpcn/jcoder/run/annotation/Cache.java
index 9c84cb0..831d362 100644
--- a/src/main/java/org/nlpcn/jcoder/run/annotation/Cache.java
+++ b/src/main/java/org/nlpcn/jcoder/run/annotation/Cache.java
@@ -1,15 +1,20 @@
package org.nlpcn.jcoder.run.annotation;
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* make cache by action, if you used it , it only use method args by cache key ,
* so not use request or response !
- *
+ *
* @author ansj
+ *
*/
@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD})
+@Target({ ElementType.METHOD })
@Documented
public @interface Cache {
diff --git a/src/main/java/org/nlpcn/jcoder/run/annotation/DefaultExecute.java b/src/main/java/org/nlpcn/jcoder/run/annotation/DefaultExecute.java
new file mode 100644
index 0000000..e47858e
--- /dev/null
+++ b/src/main/java/org/nlpcn/jcoder/run/annotation/DefaultExecute.java
@@ -0,0 +1,38 @@
+package org.nlpcn.jcoder.run.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * execute function use it by classname/funname
+ *
+ * @author ansj
+ *
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Documented
+public @interface DefaultExecute {
+
+ /**
+ * 需要映射的HTTP方法,例如POST GET 等等
+ */
+ String[] methods() default {};
+
+ /**
+ * is publish as restful
+ *
+ * @return true
+ */
+ boolean restful() default true;
+
+ /**
+ * is publish as rpc
+ *
+ * @return true
+ */
+ boolean rpc() default true;
+}
diff --git a/src/main/java/org/nlpcn/jcoder/run/annotation/Execute.java b/src/main/java/org/nlpcn/jcoder/run/annotation/Execute.java
index ebc7dce..0ae5f2b 100644
--- a/src/main/java/org/nlpcn/jcoder/run/annotation/Execute.java
+++ b/src/main/java/org/nlpcn/jcoder/run/annotation/Execute.java
@@ -1,14 +1,19 @@
package org.nlpcn.jcoder.run.annotation;
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* execute function use it by classname/funname
- *
+ *
* @author ansj
+ *
*/
@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD})
+@Target({ ElementType.TYPE, ElementType.METHOD })
@Documented
public @interface Execute {
@@ -19,14 +24,14 @@
/**
* is publish as restful
- *
+ *
* @return true
*/
boolean restful() default true;
/**
* is publish as rpc
- *
+ *
* @return true
*/
boolean rpc() default true;
diff --git a/src/main/java/org/nlpcn/jcoder/run/annotation/Schedule.java b/src/main/java/org/nlpcn/jcoder/run/annotation/Schedule.java
deleted file mode 100644
index 06c1e6b..0000000
--- a/src/main/java/org/nlpcn/jcoder/run/annotation/Schedule.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.nlpcn.jcoder.run.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * execute function use it by classname/funname
- *
- * @author ansj
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE})
-@Documented
-public @interface Schedule {
- String value() default "" ;
-}
diff --git a/src/main/java/org/nlpcn/jcoder/run/annotation/Single.java b/src/main/java/org/nlpcn/jcoder/run/annotation/Single.java
index 819c9aa..0c46d35 100644
--- a/src/main/java/org/nlpcn/jcoder/run/annotation/Single.java
+++ b/src/main/java/org/nlpcn/jcoder/run/annotation/Single.java
@@ -1,15 +1,20 @@
package org.nlpcn.jcoder.run.annotation;
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
- * is object Singleton is not set it is true
- *
+ * is object Singleton is not set it is true
+ *
* @author ansj
+ *
*/
@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE})
+@Target({ElementType.TYPE, ElementType.METHOD})
@Documented
public @interface Single {
- boolean value() default true;
+ boolean value() default true ;
}
diff --git a/src/main/java/org/nlpcn/jcoder/run/java/CharSequenceJavaFileObject.java b/src/main/java/org/nlpcn/jcoder/run/java/CharSequenceJavaFileObject.java
index 3cccce8..a72e7a5 100644
--- a/src/main/java/org/nlpcn/jcoder/run/java/CharSequenceJavaFileObject.java
+++ b/src/main/java/org/nlpcn/jcoder/run/java/CharSequenceJavaFileObject.java
@@ -1,25 +1,25 @@
package org.nlpcn.jcoder.run.java;
-
+
import javax.tools.JavaFileObject;
import javax.tools.SimpleJavaFileObject;
import java.net.URI;
-
+
public class CharSequenceJavaFileObject extends SimpleJavaFileObject {
-
- private CharSequence content;
-
-
- public CharSequenceJavaFileObject(String className,
- CharSequence content) {
- super(URI.create("string:///" + className.replace('.', '/')
- + JavaFileObject.Kind.SOURCE.extension), JavaFileObject.Kind.SOURCE);
- this.content = content;
- }
-
- @Override
- public CharSequence getCharContent(
- boolean ignoreEncodingErrors) {
- return content;
- }
+
+ private CharSequence content;
+
+
+ public CharSequenceJavaFileObject(String className,
+ CharSequence content) {
+ super(URI.create("string:///" + className.replace('.', '/')
+ + JavaFileObject.Kind.SOURCE.extension), JavaFileObject.Kind.SOURCE);
+ this.content = content;
+ }
+
+ @Override
+ public CharSequence getCharContent(
+ boolean ignoreEncodingErrors) {
+ return content;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/org/nlpcn/jcoder/run/java/ClassFileManager.java b/src/main/java/org/nlpcn/jcoder/run/java/ClassFileManager.java
index 1234753..cfb7277 100644
--- a/src/main/java/org/nlpcn/jcoder/run/java/ClassFileManager.java
+++ b/src/main/java/org/nlpcn/jcoder/run/java/ClassFileManager.java
@@ -10,41 +10,41 @@
@SuppressWarnings("all")
public class ClassFileManager extends
- ForwardingJavaFileManager {
-
- private List javaClassObjectList;
-
- public ClassFileManager(StandardJavaFileManager
- standardManager) {
- super(standardManager);
- this.javaClassObjectList = new ArrayList();
- }
-
- public JavaClassObject getMainJavaClassObject() {
- if (this.javaClassObjectList != null && this.javaClassObjectList.size() > 0) {
- int size = this.javaClassObjectList.size();
- return this.javaClassObjectList.get((size - 1));
- }
- return null;
- }
-
- public List getInnerClassJavaClassObject() {
- if (this.javaClassObjectList != null && this.javaClassObjectList.size() > 0) {
- int size = this.javaClassObjectList.size();
- if (size == 1) {
- return null;
- }
- return this.javaClassObjectList.subList(0, size - 1);
- }
- return null;
- }
-
- @Override
- public JavaFileObject getJavaFileForOutput(Location location,
- String className, JavaFileObject.Kind kind, FileObject sibling)
- throws IOException {
- JavaClassObject jclassObject = new JavaClassObject(className, kind);
- this.javaClassObjectList.add(jclassObject);
- return jclassObject;
- }
+ ForwardingJavaFileManager {
+
+ private List javaClassObjectList;
+
+ public ClassFileManager(StandardJavaFileManager
+ standardManager) {
+ super(standardManager);
+ this.javaClassObjectList = new ArrayList();
+ }
+
+ public JavaClassObject getMainJavaClassObject() {
+ if (this.javaClassObjectList != null && this.javaClassObjectList.size() > 0) {
+ int size = this.javaClassObjectList.size();
+ return this.javaClassObjectList.get((size - 1));
+ }
+ return null;
+ }
+
+ public List getInnerClassJavaClassObject() {
+ if (this.javaClassObjectList != null && this.javaClassObjectList.size() > 0) {
+ int size = this.javaClassObjectList.size();
+ if (size == 1) {
+ return null;
+ }
+ return this.javaClassObjectList.subList(0, size - 1);
+ }
+ return null;
+ }
+
+ @Override
+ public JavaFileObject getJavaFileForOutput(Location location,
+ String className, JavaFileObject.Kind kind, FileObject sibling)
+ throws IOException {
+ JavaClassObject jclassObject = new JavaClassObject(className, kind);
+ this.javaClassObjectList.add(jclassObject);
+ return jclassObject;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/org/nlpcn/jcoder/run/java/ClassUtil.java b/src/main/java/org/nlpcn/jcoder/run/java/ClassUtil.java
index 62a93cc..53bc749 100644
--- a/src/main/java/org/nlpcn/jcoder/run/java/ClassUtil.java
+++ b/src/main/java/org/nlpcn/jcoder/run/java/ClassUtil.java
@@ -1,21 +1,31 @@
package org.nlpcn.jcoder.run.java;
-import org.nlpcn.jcoder.util.JcoderIOUtil;
-
-import java.io.*;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
import java.net.JarURLConnection;
import java.net.URL;
import java.net.URLDecoder;
+import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
+import org.nlpcn.jcoder.util.JcoderIOUtil;
+
+import com.google.common.base.Joiner;
+
/**
* 类相关的工具类
- *
+ *
* @author ohergal
+ *
*/
public class ClassUtil {
@@ -40,11 +50,11 @@ public static String[] getPackageAllClassName(String classLocation, String packa
/**
* 从包package中获取所有的Class
- *
- * @param packageName
+ *
+ * @param pack
* @return
*/
- public static Map getClasses(String packageName, ClassLoader classLoader) {
+ public static Map getClasses(String packageName) {
// 第一个class类的集合
Map classes = new HashMap<>();
@@ -56,10 +66,12 @@ public static Map getClasses(String packageName, ClassLoader cla
// 定义一个枚举的集合 并进行循环来处理这个目录下的things
Enumeration dirs;
+ ClassLoader loader = DynamicEngine.getInstance().getParentClassLoader();
+
if (packageName.endsWith(".class")) { //如果只查询一个文件
String[] split = packageName.split("\\.");
-
+
StringBuilder sb = new StringBuilder();
for (int i = 0; i < split.length - 2; i++) {
sb.append(split[i]);
@@ -68,10 +80,10 @@ public static Map getClasses(String packageName, ClassLoader cla
sb.append(split[split.length - 2]);
sb.append(".class");
-
- String resourcePath = sb.toString();
-
- InputStream resourceAsStream = classLoader.getResourceAsStream(resourcePath);
+
+ String resourcePath = sb.toString() ;
+
+ InputStream resourceAsStream = loader.getResourceAsStream(resourcePath);
byte[] input2Bytes;
try {
input2Bytes = JcoderIOUtil.input2Bytes(resourceAsStream);
@@ -84,7 +96,7 @@ public static Map getClasses(String packageName, ClassLoader cla
}
try {
- dirs = classLoader.getResources(packageDirName);
+ dirs = loader.getResources(packageDirName);
// 循环迭代下去
while (dirs.hasMoreElements()) {
// 获取下一个元素
@@ -154,7 +166,7 @@ public static Map getClasses(String packageName, ClassLoader cla
/**
* 以文件的形式来获取包下的所有Class
- *
+ *
* @param packageName
* @param packagePath
* @param recursive
diff --git a/src/main/java/org/nlpcn/jcoder/run/java/DynamicClassLoader.java b/src/main/java/org/nlpcn/jcoder/run/java/DynamicClassLoader.java
index 22012c4..3998633 100644
--- a/src/main/java/org/nlpcn/jcoder/run/java/DynamicClassLoader.java
+++ b/src/main/java/org/nlpcn/jcoder/run/java/DynamicClassLoader.java
@@ -3,18 +3,18 @@
import java.net.URL;
import java.net.URLClassLoader;
-
+
public class DynamicClassLoader extends URLClassLoader {
- public DynamicClassLoader(ClassLoader parent) {
- super(new URL[0], parent);
- }
-
- public Class findClassByClassName(String className) throws ClassNotFoundException {
- return this.findClass(className);
- }
-
- public Class loadClass(String fullName, JavaClassObject jco) {
- byte[] classData = jco.getBytes();
- return this.defineClass(fullName, classData, 0, classData.length);
- }
+ public DynamicClassLoader(ClassLoader parent) {
+ super(new URL[0], parent);
+ }
+
+ public Class findClassByClassName(String className) throws ClassNotFoundException {
+ return this.findClass(className);
+ }
+
+ public Class loadClass(String fullName, JavaClassObject jco) {
+ byte[] classData = jco.getBytes();
+ return this.defineClass(fullName, classData, 0, classData.length);
+ }
}
\ No newline at end of file
diff --git a/src/main/java/org/nlpcn/jcoder/run/java/DynamicEngine.java b/src/main/java/org/nlpcn/jcoder/run/java/DynamicEngine.java
index df01fc8..0680099 100644
--- a/src/main/java/org/nlpcn/jcoder/run/java/DynamicEngine.java
+++ b/src/main/java/org/nlpcn/jcoder/run/java/DynamicEngine.java
@@ -1,14 +1,5 @@
package org.nlpcn.jcoder.run.java;
-import com.google.common.base.Joiner;
-import org.nlpcn.jcoder.run.CodeException;
-import org.nlpcn.jcoder.scheduler.TaskException;
-import org.nlpcn.jcoder.util.StaticValue;
-import org.nlpcn.jcoder.util.StringUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.tools.*;
import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
@@ -19,33 +10,56 @@
import java.util.List;
import java.util.Set;
-@SuppressWarnings("all")
-public class DynamicEngine {
+import javax.tools.Diagnostic;
+import javax.tools.DiagnosticCollector;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.ToolProvider;
- private static final Logger LOG = LoggerFactory.getLogger(DynamicEngine.class);
+import org.apache.log4j.Logger;
+import org.nlpcn.commons.lang.util.StringUtil;
+import org.nlpcn.jcoder.controller.ThreadAction;
+import org.nlpcn.jcoder.run.CodeException;
+import org.nlpcn.jcoder.scheduler.TaskException;
+import org.nlpcn.jcoder.service.TaskService;
+import org.nlpcn.jcoder.util.StaticValue;
- private String groupName;
- private URLClassLoader classLoader;
- private String classpath;
+import com.google.common.base.Joiner;
+@SuppressWarnings("all")
+public class DynamicEngine {
- public DynamicEngine(String groupName) {
- this.groupName = groupName;
- }
+ private static final Logger LOG = Logger.getLogger(DynamicEngine.class);
- private DynamicEngine(URLClassLoader classLoader) {
- this.classLoader = classLoader;
- this.buildClassPath();
+ private static DynamicEngine ourInstance;
+
+ public static DynamicEngine getInstance() {
+ return ourInstance;
}
/**
* 刷新instance
- *
- * @throws TaskException
+ * @throws TaskException
*/
- public void flush(URLClassLoader classLoader) throws TaskException {
- // if class load change , to flush all task
- this.classLoader = classLoader;
+ public static void flush(URLClassLoader classLoader) throws TaskException {
+ ourInstance = new DynamicEngine(classLoader);
+ // 如果classloader被改变.全站的动态代码全部刷新一遍.
+ synchronized (StaticValue.MAPPING) {
+ StaticValue.getBean(TaskService.class, "taskService").initTaskFromDB();
+ }
+
+ }
+
+ public static void close() throws IOException {
+ ourInstance.parentClassLoader.close();
+ }
+
+ private URLClassLoader parentClassLoader;
+
+ private String classpath;
+
+ private DynamicEngine(URLClassLoader classLoader) {
+ this.parentClassLoader = classLoader;
this.buildClassPath();
}
@@ -53,7 +67,7 @@ private void buildClassPath() {
this.classpath = null;
Set classPathSet = new HashSet<>();
- for (URL url : this.classLoader.getURLs()) {
+ for (URL url : this.parentClassLoader.getURLs()) {
try {
String p = new File(url.toURI()).getAbsolutePath();
classPathSet.add(p);
@@ -90,15 +104,12 @@ public Class javaCodeToClass(String fullClassName, String javaCode) throws IO
options.add("-classpath");
options.add(this.classpath);
options.add("-parameters");
- if (StaticValue.TESTRING) {
- options.add("-g");
- }
JavaCompiler.CompilationTask task = compiler.getTask(null, fileManager, diagnostics, options, null, jfiles);
boolean success = task.call();
if (success) {
JavaClassObject jco = fileManager.getMainJavaClassObject();
- DynamicClassLoader dynamicClassLoader = new DynamicClassLoader(this.classLoader);
+ DynamicClassLoader dynamicClassLoader = new DynamicClassLoader(this.parentClassLoader);
try {
List innerClassJcos = fileManager.getInnerClassJavaClassObject();
if (innerClassJcos != null && innerClassJcos.size() > 0) {
@@ -111,9 +122,9 @@ public Class javaCodeToClass(String fullClassName, String javaCode) throws IO
clazz = dynamicClassLoader.loadClass(fullClassName, jco);
} catch (Exception e) {
e.printStackTrace();
- LOG.error(e.getMessage(), e);
+ LOG.error(e);
} catch (Error e) {
- LOG.error(e.getMessage(), e);
+ LOG.error(e);
throw new CodeException(e.toString());
} finally {
if (dynamicClassLoader != null) {
@@ -130,7 +141,8 @@ public Class javaCodeToClass(String fullClassName, String javaCode) throws IO
return clazz;
}
-
+
+
public byte[] javaCode2Bytes(String fullClassName, String javaCode) throws IOException, CodeException {
Class clazz = null;
JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
@@ -140,7 +152,7 @@ public byte[] javaCode2Bytes(String fullClassName, String javaCode) throws IOExc
jfiles.add(new CharSequenceJavaFileObject(fullClassName, javaCode));
List options = new ArrayList();
-
+
options.add("-source");
options.add("1.6");
options.add("-target");
@@ -150,12 +162,13 @@ public byte[] javaCode2Bytes(String fullClassName, String javaCode) throws IOExc
options.add("-classpath");
options.add(this.classpath);
options.add("-parameters");
+
JavaCompiler.CompilationTask task = compiler.getTask(null, fileManager, diagnostics, options, null, jfiles);
boolean success = task.call();
if (success) {
JavaClassObject jco = fileManager.getMainJavaClassObject();
- DynamicClassLoader dynamicClassLoader = new DynamicClassLoader(this.classLoader);
+ DynamicClassLoader dynamicClassLoader = new DynamicClassLoader(this.parentClassLoader);
try {
List innerClassJcos = fileManager.getInnerClassJavaClassObject();
if (innerClassJcos != null && innerClassJcos.size() > 0) {
@@ -165,12 +178,12 @@ public byte[] javaCode2Bytes(String fullClassName, String javaCode) throws IOExc
dynamicClassLoader.loadClass(name, inner);
}
}
- return jco.getBytes();
+ return jco.getBytes() ;
} catch (Exception e) {
e.printStackTrace();
- LOG.error(e.getMessage(), e);
+ LOG.error(e);
} catch (Error e) {
- LOG.error(e.getMessage(), e);
+ LOG.error(e);
throw new CodeException(e.toString());
} finally {
if (dynamicClassLoader != null) {
@@ -185,7 +198,7 @@ public byte[] javaCode2Bytes(String fullClassName, String javaCode) throws IOExc
throw new CodeException(error.toString());
}
- return null;
+ return null ;
}
public T javaCodeToObject(String fullClassName, String javaCode) throws IllegalAccessException, InstantiationException, IOException, CodeException {
@@ -207,7 +220,7 @@ private StringBuilder compilePrint(Diagnostic diagnostic) {
}
public T javaCodeToObject(String content) throws IllegalAccessException, InstantiationException, IOException, CodeException {
- String className = new JavaSourceUtil(content).getFullName();
+ String className = JavaSourceUtil.findFullName(content);
if (StringUtil.isBlank(className)) {
throw new ClassFormatError("can find class name ,please define it ! use javaCodeToObject(String fullClassName, String javaCode)");
}
@@ -215,27 +228,20 @@ public T javaCodeToObject(String content) throws IllegalAccessException, Ins
}
public Class javaCodeToClass(String content) throws IOException, CodeException {
- String className = new JavaSourceUtil(content).getFullName();
+ String className = JavaSourceUtil.findFullName(content);
if (StringUtil.isBlank(className)) {
throw new ClassFormatError("can find class name ,please define it ! use javaCodeToObject(String fullClassName, String javaCode)");
}
return this.javaCodeToClass(className, content);
}
- public URLClassLoader getClassLoader() {
- return classLoader;
+ public URLClassLoader getParentClassLoader() {
+ return parentClassLoader;
}
-
- public void close() throws IOException {
- if (this.classLoader != null) {
- this.classLoader.close();
- System.gc();
- try {
- Thread.sleep(300L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
+ public Class javaCodeToClassFile(String string, String sourcePath) {
+ // TODO Auto-generated method stub
+ return null;
}
+
}
\ No newline at end of file
diff --git a/src/main/java/org/nlpcn/jcoder/run/java/JavaClassObject.java b/src/main/java/org/nlpcn/jcoder/run/java/JavaClassObject.java
index 5112337..699897a 100644
--- a/src/main/java/org/nlpcn/jcoder/run/java/JavaClassObject.java
+++ b/src/main/java/org/nlpcn/jcoder/run/java/JavaClassObject.java
@@ -6,25 +6,25 @@
import java.io.IOException;
import java.io.OutputStream;
import java.net.URI;
-
+
public class JavaClassObject extends SimpleJavaFileObject {
-
- protected final ByteArrayOutputStream bos =
- new ByteArrayOutputStream();
-
-
- public JavaClassObject(String name, JavaFileObject.Kind kind) {
- super(URI.create("string:///" + name.replace('.', '/')
- + kind.extension), kind);
- }
-
-
- public byte[] getBytes() {
- return bos.toByteArray();
- }
-
- @Override
- public OutputStream openOutputStream() throws IOException {
- return bos;
- }
+
+ protected final ByteArrayOutputStream bos =
+ new ByteArrayOutputStream();
+
+
+ public JavaClassObject(String name, JavaFileObject.Kind kind) {
+ super(URI.create("string:///" + name.replace('.', '/')
+ + kind.extension), kind);
+ }
+
+
+ public byte[] getBytes() {
+ return bos.toByteArray();
+ }
+
+ @Override
+ public OutputStream openOutputStream() throws IOException {
+ return bos;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/org/nlpcn/jcoder/run/java/JavaRunner.java b/src/main/java/org/nlpcn/jcoder/run/java/JavaRunner.java
index 44aa8ce..2a22a36 100644
--- a/src/main/java/org/nlpcn/jcoder/run/java/JavaRunner.java
+++ b/src/main/java/org/nlpcn/jcoder/run/java/JavaRunner.java
@@ -1,331 +1,317 @@
-package org.nlpcn.jcoder.run.java;
-
-import com.google.common.collect.Sets;
-import org.nlpcn.jcoder.domain.CodeInfo;
-import org.nlpcn.jcoder.domain.Task;
-import org.nlpcn.jcoder.run.CodeException;
-import org.nlpcn.jcoder.run.CodeRuntimeException;
-import org.nlpcn.jcoder.run.annotation.Execute;
-import org.nlpcn.jcoder.run.annotation.Single;
-import org.nlpcn.jcoder.run.rpc.Rpcs;
-import org.nlpcn.jcoder.run.rpc.domain.RpcContext;
-import org.nlpcn.jcoder.service.JarService;
-import org.nlpcn.jcoder.util.ExceptionUtil;
-import org.nlpcn.jcoder.util.MapCount;
-import org.nlpcn.jcoder.util.StringUtil;
-import org.nutz.ioc.Ioc;
-import org.nutz.ioc.loader.annotation.Inject;
-import org.nutz.lang.Mirror;
-import org.nutz.lang.reflect.FastClassFactory;
-import org.nutz.mvc.Mvcs;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.Map.Entry;
-
-public class JavaRunner {
-
- private static final Logger LOG = LoggerFactory.getLogger(JavaRunner.class);
- private static final Object[] DEFAULT_ARG = new Object[0];
- private Task task = null;
- private CodeInfo codeInfo;
- private Object objInstance;
-
- public JavaRunner(Task task) {
- this.task = task;
- this.codeInfo = task.codeInfo();
- }
-
- /**
- * compile to class if , class in task , it nothing to do!
- *
- * @return
- * @throws CodeException
- */
- public JavaRunner compile() {
-
- if (codeInfo.getClassz() != null) {
- return this;
- }
-
- synchronized (codeInfo) {
- if (codeInfo.getClassz() == null) try {
-
- String code = task.getCode();
-
- JarService jarService = JarService.getOrCreate(task.getGroupName());
-
- DynamicEngine de = jarService.getEngine();
-
- codeInfo.setioc(jarService.getIoc());
-
- JavaSourceUtil javaSourceUtil = new JavaSourceUtil(code);
-
- String pack = javaSourceUtil.getPackage();
- String className = javaSourceUtil.getClassName();
-
- LOG.info("to compile " + pack + "." + className);
-
- if (StringUtil.isBlank(pack)) {
- throw new CodeException("package 不能为空");
- }
-
- if (className == null) {
- throw new CodeException("not find className");
- }
-
- codeInfo.setClassLoader(de.getClassLoader());
-
- Class clz = (Class) de.javaCodeToClass(pack + "." + className, code);
-
- Single single = clz.getAnnotation(Single.class);
-
- codeInfo.setClassz(clz);
-
- if (single != null) {
- codeInfo.setSingle(single.value());
- }
-
- MapCount mc = new MapCount<>();
- // set execute method
- for (Method method : clz.getMethods()) {
- if (!Modifier.isPublic(method.getModifiers()) || method.isBridge() || method.getDeclaringClass() != clz) {
- continue;
- }
- Execute execute = null;
-
- if ((execute = Mirror.getAnnotationDeep(method, Execute.class)) != null) { // 先default
- codeInfo.addMethod(method, Sets.newHashSet(Arrays.asList(execute.methods())), execute.rpc(), execute.restful());
- mc.add(method.getName());
- }
- }
-
- if (mc.size() == 0) {
- throw new CodeRuntimeException("you must set a @Execute annotation for execute");
- }
-
- StringBuilder sb = null;
- for (Entry entry : mc.get().entrySet()) {
- if (entry.getValue() > 1) {
- if (sb == null) {
- sb = new StringBuilder();
- }
- sb.append(entry.getKey() + " ");
- }
- }
-
- if (sb != null && sb.length() > 0) {
- sb.append(" Execute method name repetition");
- throw new CodeRuntimeException(sb.toString());
- }
-
- codeInfo.getDefaultMethod(); // 空取一下，如果报异常活该
-
- codeInfo.setClassz(clz);
-
- } catch (IOException | CodeException e) {
- LOG.debug("code compile err ", e);
- throw new CodeRuntimeException(e);
- }
- }
-
- return this;
- }
-
- /**
- * instance and inject objcet if object is created , it nothing to do !
- *
- * @return
- */
- public JavaRunner instance() {
-
- if (!codeInfo.isSingle()) {// if not single .it only instance by run
- _instance();
- return this;
- }
-
- if (codeInfo.getJavaObject() != null && !codeInfo.iocChanged(task.getGroupName())) {
- this.objInstance = codeInfo.getJavaObject();
- return this;
- }
-
- synchronized (codeInfo) {
- if (codeInfo.getJavaObject() == null || codeInfo.iocChanged(task.getGroupName())) {
- _instance();
- } else {
- this.objInstance = codeInfo.getJavaObject();
- }
- }
-
- return this;
- }
-
- private void _instance() {
-
- ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
-
- Ioc contextIoc = Mvcs.getIoc();
-
-
- try {
- LOG.info("to instance with ioc className: " + codeInfo.getClassz().getName());
-
- /**
- * 设置groupname
- */
- RpcContext ctx = Rpcs.ctx();
- if (ctx.getGroupName() == null) {
- ctx.setGroupName(task.getGroupName());
- }
-
- Thread.currentThread().setContextClassLoader(codeInfo.getClassLoader());
-
- Mvcs.setIoc(codeInfo.getIoc());
-
- objInstance = codeInfo.getClassz().newInstance();
-
- Mirror mirror = Mirror.me(codeInfo.getClassz());
-
- //TODO: nutz的bug，暂时这么处理,更新后替换
- FastClassFactory.clearCache();
-
- for (Field field : mirror.getFields()) {
- Inject inject = field.getAnnotation(Inject.class);
- if (inject != null) {
- field.setAccessible(true);
- if (field.getType().equals(org.slf4j.Logger.class)) {
- mirror.setValue(objInstance, field, LoggerFactory.getLogger(codeInfo.getClassz()));
- } else {
- mirror.setValue(objInstance, field, codeInfo.getIoc().get(field.getType(), StringUtil.isBlank(inject.value()) ? field.getName() : inject.value()));
- }
- field.setAccessible(false);
- }
- }
-
- if (codeInfo.isSingle()) {
- codeInfo.setJavaObject(objInstance);
- }
- } catch (InstantiationException | IllegalAccessException e) {
- e.printStackTrace();
- throw new CodeRuntimeException(e);
- } finally {
- Thread.currentThread().setContextClassLoader(contextClassLoader);
- Mvcs.setIoc(contextIoc);
- }
- }
-
- /**
- * @return
- */
- public Task getTask() {
- return this.task;
- }
-
- /**
- * execte task defaultExecute if not found , it execute excutemehtod ， if not found it throw Exception
- *
- * @return
- * @throws CodeException
- */
- public Object execute() {
- return execute(this.codeInfo.getDefaultMethod().getMethod(), DEFAULT_ARG);
- }
-
- /**
- * execte task defaultExecute if not found , it execute excutemehtod ， if not found it throw Exception
- *
- * @return
- * @throws CodeException
- */
- public Object execute(Method method, Object[] args) {
- long start = System.currentTimeMillis();
-
- ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
-
- Ioc contextIoc = Mvcs.getIoc();
-
- try {
- Thread.currentThread().setContextClassLoader(codeInfo.getClassLoader());
- Mvcs.setIoc(codeInfo.getIoc());
- Object invoke = method.invoke(objInstance, args);
- String endInfo = "Execute OK " + task.getName() + "/" + method.getName() + " succesed ! use Time : " + (System.currentTimeMillis() - start);
- LOG.info(endInfo);
- this.task.updateSuccess();
- return invoke;
- } catch (Exception e) {
- this.task.updateError();
- LOG.error("Execute ERR " + task.getName() + "/" + method.getName() + " useTime " + (System.currentTimeMillis() - start) + " erred : " + ExceptionUtil.printStackTraceWithOutLine(e));
- e.printStackTrace();
- throw new CodeRuntimeException(ExceptionUtil.realException(e));
- } finally {
- Thread.currentThread().setContextClassLoader(contextClassLoader);
- Mvcs.setIoc(contextIoc);
- }
- }
-
- /**
- * to compile it and validate some function
- *
- * @return it always return true
- * @throws CodeException
- * @throws IOException
- */
- public boolean check() throws CodeException, IOException {
- String code = task.getCode();
-
- DynamicEngine de = JarService.getOrCreate(task.getGroupName()).getEngine();
-
- JavaSourceUtil javaSourceUtil = new JavaSourceUtil(code);
-
- String pack = javaSourceUtil.getPackage();
-
- String className = javaSourceUtil.getClassName();
-
- if (className == null) {
- throw new CodeException("not find className");
- }
-
- Class clz = (Class) de.javaCodeToClass(pack + "." + className, code);
-
- MapCount mc = new MapCount<>();
- // set execute method
- for (Method method : clz.getMethods()) {
- if (!Modifier.isPublic(method.getModifiers()) || method.isBridge() || method.getDeclaringClass() != clz) {
- continue;
- }
-
- if (Mirror.getAnnotationDeep(method, Execute.class) != null) { // 先default
- mc.add(method.getName());
- }
- }
-
- if (mc.size() == 0) {
- throw new CodeRuntimeException("you must set a Execute annotation for execute");
- }
-
- StringBuilder sb = null;
- for (Entry entry : mc.get().entrySet()) {
- if (entry.getValue() > 1) {
- if (sb == null) {
- sb = new StringBuilder();
- }
- sb.append(entry.getKey() + " ");
- }
- }
-
- if (sb != null && sb.length() > 0) {
- sb.append(" Execute method name repetition");
- throw new CodeRuntimeException(sb.toString());
- }
-
- return true;
-
- }
-
-
-}
+package org.nlpcn.jcoder.run.java;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.Map.Entry;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.chainsaw.Main;
+import org.nlpcn.commons.lang.util.MapCount;
+import org.nlpcn.commons.lang.util.StringUtil;
+import org.nlpcn.jcoder.domain.CodeInfo;
+import org.nlpcn.jcoder.domain.Task;
+import org.nlpcn.jcoder.run.CodeException;
+import org.nlpcn.jcoder.run.CodeRuntimeException;
+import org.nlpcn.jcoder.run.annotation.DefaultExecute;
+import org.nlpcn.jcoder.run.annotation.Execute;
+import org.nlpcn.jcoder.run.annotation.Single;
+import org.nlpcn.jcoder.util.DateUtils;
+import org.nlpcn.jcoder.util.ExceptionUtil;
+import org.nlpcn.jcoder.util.StaticValue;
+import org.nutz.ioc.Ioc;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.lang.Mirror;
+
+import com.google.common.collect.Sets;
+
+public class JavaRunner {
+
+ private static final Logger LOG = Logger.getLogger(JavaRunner.class);
+
+ private Task task = null;
+
+ private CodeInfo codeInfo;
+
+ private Object objInstance;
+
+ public JavaRunner(Task task) {
+ this.task = task;
+ this.codeInfo = task.codeInfo();
+ }
+
+ /**
+ * compile to class if , class in task , it nothing to do!
+ *
+ * @return
+ * @throws CodeException
+ */
+ public JavaRunner compile() {
+
+ if (codeInfo.getClassz() != null) {
+ return this;
+ }
+
+ synchronized (codeInfo) {
+ if (codeInfo.getClassz() == null) {
+ try {
+
+ String code = task.getCode();
+
+ DynamicEngine de = DynamicEngine.getInstance();
+
+ String pack = JavaSourceUtil.findPackage(code);
+
+ String className = JavaSourceUtil.findClassName(code);
+
+ LOG.info("to compile " + pack + "." + className);
+
+ if (className == null) {
+ throw new CodeException("not find className");
+ }
+
+ codeInfo.setClassLoader(de.getParentClassLoader());
+
+ Class clz = (Class) de.javaCodeToClass(pack + "." + className, code);
+
+ Single single = clz.getAnnotation(Single.class);
+
+ codeInfo.setClassz(clz);
+
+ if (single != null) {
+ codeInfo.setSingle(single.value());
+ }
+
+ MapCount mc = new MapCount<>();
+ // set execute method
+ for (Method method : clz.getMethods()) {
+ if (!Modifier.isPublic(method.getModifiers()) || method.isBridge() || method.getDeclaringClass() != clz) {
+ continue;
+ }
+ DefaultExecute dExecute = null;
+ Execute execute = null;
+ if ((dExecute = Mirror.getAnnotationDeep(method, DefaultExecute.class)) != null) {
+ codeInfo.setDefaultMethod(method, Sets.newHashSet(Arrays.asList(dExecute.methods())), dExecute.rpc(), dExecute.restful());
+ mc.add(method.getName());
+ } else if ((execute = Mirror.getAnnotationDeep(method, Execute.class)) != null) { // 先default
+ codeInfo.addMethod(method, Sets.newHashSet(Arrays.asList(execute.methods())), execute.rpc(), execute.restful());
+ mc.add(method.getName());
+ }
+ }
+
+ if (mc.size() == 0) {
+ throw new CodeRuntimeException("you must set a Execute or DefaultExecute annotation for execute");
+ }
+
+ StringBuilder sb = null;
+ for (Entry entry : mc.get().entrySet()) {
+ if (entry.getValue() > 1) {
+ if (sb == null) {
+ sb = new StringBuilder();
+ }
+ sb.append(entry.getKey() + " ");
+ }
+ }
+
+ if (sb != null && sb.length() > 0) {
+ sb.append(" Execute method name repetition");
+ throw new CodeRuntimeException(sb.toString());
+ }
+
+ codeInfo.getDefaultMethod(); // 空取一下，如果报异常活该
+
+ codeInfo.setClassz(clz);
+
+ } catch (IOException | CodeException e) {
+ e.printStackTrace();
+ throw new CodeRuntimeException(e);
+ }
+ }
+ }
+
+ return this;
+ }
+
+ /**
+ * instance and inject objcet if object is created , it nothing to do !
+ *
+ * @return
+ */
+ public JavaRunner instance() {
+
+ if (!codeInfo.isSingle()) {// if not single .it only instance by run
+ _instance();
+ return this;
+ }
+
+ if (codeInfo.getJavaObject() != null && !codeInfo.iocChanged()) {
+ this.objInstance = codeInfo.getJavaObject();
+ return this;
+ }
+
+ synchronized (codeInfo) {
+ if (codeInfo.getJavaObject() == null || codeInfo.iocChanged()) {
+ _instance();
+ } else {
+ this.objInstance = codeInfo.getJavaObject();
+ }
+ }
+
+ return this;
+ }
+
+ private void _instance() {
+ try {
+ LOG.info("to instance with ioc className: " + codeInfo.getClassz().getName());
+
+ objInstance = codeInfo.getClassz().newInstance();
+
+ Ioc ioc = StaticValue.getUserIoc();
+
+ codeInfo.setioc(ioc);
+
+ Mirror mirror = Mirror.me(codeInfo.getClassz());
+
+ ClassLoader defaultClassLoader = Thread.currentThread().getContextClassLoader();
+
+ Thread.currentThread().setContextClassLoader(DynamicEngine.getInstance().getParentClassLoader());
+ for (Field field : mirror.getFields()) {
+ Inject inject = field.getAnnotation(Inject.class);
+ if (inject != null) {
+ field.setAccessible(true);
+ if (field.getType().equals(Logger.class)) {
+ mirror.setValue(objInstance, field, Logger.getLogger(codeInfo.getClassz()));
+ } else {
+ mirror.setValue(objInstance, field, ioc.get(field.getType(), StringUtil.isBlank(inject.value()) ? field.getName() : inject.value()));
+ }
+ field.setAccessible(false);
+ }
+ }
+ Thread.currentThread().setContextClassLoader(defaultClassLoader);
+
+ if (codeInfo.isSingle()) {
+ codeInfo.setJavaObject(objInstance);
+ }
+ } catch (InstantiationException | IllegalAccessException e) {
+ e.printStackTrace();
+ throw new CodeRuntimeException(e);
+ }
+ }
+
+ /**
+ * @return
+ */
+ public Task getTask() {
+ return this.task;
+ }
+
+ private static final Object[] DEFAULT_ARG = new Object[0];
+
+ /**
+ * execte task defaultExecute if not found , it execute excutemehtod ， if not found it throw Exception
+ *
+ * @return
+ *
+ * @throws CodeException
+ */
+ public Object execute() {
+ return execute(this.codeInfo.getDefaultMethod().getMethod(), DEFAULT_ARG);
+ }
+
+ /**
+ * execte task defaultExecute if not found , it execute excutemehtod ， if not found it throw Exception
+ *
+ * @return
+ *
+ * @throws CodeException
+ */
+ public Object execute(Method method, Object[] args) {
+ long start = System.currentTimeMillis();
+ try {
+ Object invoke = method.invoke(objInstance, args);
+ String endInfo = "Execute OK " + task.getName() + "/" + method.getName() + " succesed ! use Time : " + (System.currentTimeMillis() - start);
+ task.setMessage(endInfo);
+ LOG.info(endInfo);
+ this.task.updateSuccess();
+ return invoke;
+ } catch (Exception e) {
+ e.printStackTrace();
+ this.task.updateError();
+ task.setMessage("Execute ERR " + task.getName() + "/" + method.getName() + " useTime " + (System.currentTimeMillis() - start) + " erred : " + ExceptionUtil.printStackTraceWithOutLine(e));
+ throw new CodeRuntimeException(e);
+ }
+ }
+
+ /**
+ * to compile it and validate some function
+ *
+ * @return it always return true
+ * @throws CodeException
+ * @throws IOException
+ */
+ public boolean check() throws CodeException, IOException {
+ String code = task.getCode();
+
+ DynamicEngine de = DynamicEngine.getInstance();
+
+ String pack = JavaSourceUtil.findPackage(code);
+
+ String className = JavaSourceUtil.findClassName(code);
+
+ if (className == null) {
+ throw new CodeException("not find className");
+ }
+
+ Class clz = (Class) de.javaCodeToClass(pack + "." + className, code);
+
+ MapCount mc = new MapCount<>();
+ // set execute method
+ for (Method method : clz.getMethods()) {
+ if (!Modifier.isPublic(method.getModifiers()) || method.isBridge() || method.getDeclaringClass() != clz) {
+ continue;
+ }
+
+ if (Mirror.getAnnotationDeep(method, DefaultExecute.class) != null) {
+ mc.add(method.getName());
+ } else if (Mirror.getAnnotationDeep(method, Execute.class) != null) { // 先default
+ mc.add(method.getName());
+ }
+ }
+
+ if (mc.size() == 0) {
+ throw new CodeRuntimeException("you must set a Execute or DefaultExecute annotation for execute");
+ }
+
+ StringBuilder sb = null;
+ for (Entry entry : mc.get().entrySet()) {
+ if (entry.getValue() > 1) {
+ if (sb == null) {
+ sb = new StringBuilder();
+ }
+ sb.append(entry.getKey() + " ");
+ }
+ }
+
+ if (sb != null && sb.length() > 0) {
+ sb.append(" Execute method name repetition");
+ throw new CodeRuntimeException(sb.toString());
+ }
+
+ return true;
+
+ }
+
+
+ public static void main(String[] args) {
+ long start = System.currentTimeMillis() ;
+ for (int i = 0; i < 1000000; i++) {
+// System.out.println("1234567890");
+ LOG.info("1234567890");
+ }
+ System.out.println(System.currentTimeMillis()-start);
+ }
+}
diff --git a/src/main/java/org/nlpcn/jcoder/run/java/JavaSourceUtil.java b/src/main/java/org/nlpcn/jcoder/run/java/JavaSourceUtil.java
index aa2b74d..2c94418 100644
--- a/src/main/java/org/nlpcn/jcoder/run/java/JavaSourceUtil.java
+++ b/src/main/java/org/nlpcn/jcoder/run/java/JavaSourceUtil.java
@@ -1,18 +1,10 @@
package org.nlpcn.jcoder.run.java;
-import com.github.javaparser.ast.CompilationUnit;
-import com.github.javaparser.ast.PackageDeclaration;
-import com.github.javaparser.ast.body.TypeDeclaration;
-import org.nlpcn.jcoder.run.CodeException;
-import org.nlpcn.jcoder.util.JavaDocUtil;
-import org.nlpcn.jcoder.util.StringUtil;
+import org.nlpcn.commons.lang.util.StringUtil;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.StringReader;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -20,50 +12,52 @@ public class JavaSourceUtil {
private static final Pattern PAT = Pattern.compile("public\\s+?class\\s+?.*?");
- private String className = null;
-
- private String pack = null;
-
- private List executeMethod = new ArrayList<>();
+ public static void main(String[] args) throws IOException {
+ System.out.println(findClassName("public class Test implements Execute{"));
+ }
- public JavaSourceUtil(String code) throws CodeException {
+ public static String findPackage(String sourceCode) throws IOException {
+ BufferedReader br = null;
try {
- CompilationUnit compile = JavaDocUtil.compile(code);
-
- PackageDeclaration aPackage = compile.getPackage();
-
- if (aPackage == null) {
- throw new CodeException("package can not null ");
- }
- pack = aPackage.getPackageName();
- if (StringUtil.isBlank(pack)) {
- throw new CodeException("package can not empty ");
- }
-
- List types = compile.getTypes();
+ br = new BufferedReader(new StringReader(sourceCode));
+ String temp = null;
- for (TypeDeclaration type : types) {
- if (type.getModifiers() == Modifier.PUBLIC) {
- if (className != null) {
- throw new CodeException("class not have more than one public class ");//这个情况不会发生
- }
- className = type.getName();
+ while ((temp = br.readLine()) != null) {
+ if (StringUtil.isBlank(temp)) {
+ continue;
+ }
+ if (temp.trim().startsWith("package ")) {
+ temp = temp.split("[\\s+?;]")[1];
+ return temp;
+ } else {
+ return null;
}
}
- if (className == null) {
- throw new CodeException("not find className ");
+ return null;
+ } finally {
+ if (br != null) {
+ br.close();
}
- } catch (Throwable e) {
- throw new CodeException(e.getMessage());
}
+ }
+ public static String findFullName(String sourceCode) throws IOException {
+ String pack = findPackage(sourceCode);
+ String className = findClassName(sourceCode);
+ if (className == null) {
+ return null;
+ }
+ if (pack == null) {
+ return className;
+ }
+ return pack + "." + className;
}
/**
* 根据一个类返回类名称
- *
+ *
* @param sourceCode
* @return 类名称
* @throws IOException
@@ -80,7 +74,7 @@ public static String findClassName(String sourceCode) {
Matcher matcher = PAT.matcher(temp);
if (matcher.find()) {
- temp = temp.split("[\\s+?;{]")[2];
+ temp = temp.split("[\\s+?;]")[2];
return temp;
}
}
@@ -90,22 +84,4 @@ public static String findClassName(String sourceCode) {
return null;
}
-
- public String getPackage() {
- return pack;
- }
-
- public String getFullName() throws IOException {
- return pack + "." + className;
- }
-
- /**
- * 根据一个类返回类名称
- *
- * @return 类名称
- * @throws IOException
- */
- public String getClassName() {
- return className;
- }
}
diff --git a/src/main/java/org/nlpcn/jcoder/run/mvc/ApiActionChainMaker.java b/src/main/java/org/nlpcn/jcoder/run/mvc/ApiActionChainMaker.java
index 97b171e..8675aab 100644
--- a/src/main/java/org/nlpcn/jcoder/run/mvc/ApiActionChainMaker.java
+++ b/src/main/java/org/nlpcn/jcoder/run/mvc/ApiActionChainMaker.java
@@ -1,49 +1,54 @@
-package org.nlpcn.jcoder.run.mvc;
-
-import org.nlpcn.jcoder.run.mvc.processor.*;
-import org.nutz.mvc.ActionChainMaker;
-import org.nutz.mvc.ActionInfo;
-import org.nutz.mvc.NutConfig;
-import org.nutz.mvc.Processor;
-import org.nutz.mvc.impl.processor.EncodingProcessor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ApiActionChainMaker implements ActionChainMaker {
-
- // 该接口只有一个方法
- public JcoderActionChain eval(NutConfig config, ActionInfo ai) {
- // 提醒: config可以获取ioc等信息, ai可以获取方法上的各种配置及方法本身
- // 正常处理的列表
- List list = new ArrayList<>();
- list.add(init(config, ai, new ApiProxyProcessor())); // 设置代理类
- list.add(init(config, ai, new EncodingProcessor())); // 设置编码信息@Encoding
- list.add(init(config, ai, new ApiCrossOriginProcessor()));//增加跨域支持
- list.add(init(config, ai, new ApiModuleProcessor())); // 获取入口类的对象,从ioc或直接new
- list.add(init(config, ai, new ApiActionFiltersProcessor())); // 处理@Filters
- list.add(init(config, ai, new ApiAdaptorProcessor())); // 处理@Adaptor
- ApiMethodInvokeProcessor apiMethodInvokeProcessor = new ApiMethodInvokeProcessor();
- list.add(init(config, ai, apiMethodInvokeProcessor)); // 执行入口方法
- list.add(init(config, ai, new ApiViewProcessor())); // 对入口方法进行渲染@Ok
-
- // 最后是专门负责兜底的异常处理器,这个处理器可以认为是全局异常处理器,对应@Fail
- Processor error = new ApiFailProcessor();
- try {
- error.init(config, ai);
- } catch (Throwable e) {
- e.printStackTrace();
- }
-
- return new JcoderActionChain(list, apiMethodInvokeProcessor, error, ai);
- }
-
- public Processor init(NutConfig config, ActionInfo ai, Processor p) {
- try {
- p.init(config, ai);
- } catch (Throwable e) {
- e.printStackTrace();
- }
- return p;
- }
-}
+package org.nlpcn.jcoder.run.mvc;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.nlpcn.jcoder.run.mvc.processor.ApiAdaptorProcessor;
+import org.nlpcn.jcoder.run.mvc.processor.ApiCrossOriginProcessor;
+import org.nlpcn.jcoder.run.mvc.processor.ApiFailProcessor;
+import org.nlpcn.jcoder.run.mvc.processor.ApiMethodInvokeProcessor;
+import org.nlpcn.jcoder.run.mvc.processor.ApiModuleProcessor;
+import org.nlpcn.jcoder.run.mvc.processor.ApiViewProcessor;
+import org.nutz.mvc.ActionChainMaker;
+import org.nutz.mvc.ActionInfo;
+import org.nutz.mvc.NutConfig;
+import org.nutz.mvc.Processor;
+import org.nutz.mvc.impl.processor.ActionFiltersProcessor;
+import org.nutz.mvc.impl.processor.EncodingProcessor;
+
+public class ApiActionChainMaker implements ActionChainMaker {
+
+ // 该接口只有一个方法
+ public JcoderActionChain eval(NutConfig config, ActionInfo ai) {
+ // 提醒: config可以获取ioc等信息, ai可以获取方法上的各种配置及方法本身
+ // 正常处理的列表
+ List list = new ArrayList<>();
+ list.add(init(config, ai, new EncodingProcessor())); // 设置编码信息@Encoding
+ list.add(init(config, ai, new ApiCrossOriginProcessor())) ;//增加跨域支持
+ list.add(init(config, ai, new ApiModuleProcessor())); // 获取入口类的对象,从ioc或直接new
+ list.add(init(config, ai, new ActionFiltersProcessor())); // 处理@Filters
+ list.add(init(config, ai, new ApiAdaptorProcessor())); // 处理@Adaptor
+ ApiMethodInvokeProcessor apiMethodInvokeProcessor = new ApiMethodInvokeProcessor();
+ list.add(init(config, ai, apiMethodInvokeProcessor)); // 执行入口方法
+ list.add(init(config, ai, new ApiViewProcessor())); // 对入口方法进行渲染@Ok
+
+ // 最后是专门负责兜底的异常处理器,这个处理器可以认为是全局异常处理器,对应@Fail
+ Processor error = new ApiFailProcessor();
+ try {
+ error.init(config, ai);
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
+
+ return new JcoderActionChain(list, apiMethodInvokeProcessor, error, ai);
+ }
+
+ public Processor init(NutConfig config, ActionInfo ai, Processor p) {
+ try {
+ p.init(config, ai);
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
+ return p;
+ }
+}
diff --git a/src/main/java/org/nlpcn/jcoder/run/mvc/ApiActionHandler.java b/src/main/java/org/nlpcn/jcoder/run/mvc/ApiActionHandler.java
index 673a9ef..68355c6 100644
--- a/src/main/java/org/nlpcn/jcoder/run/mvc/ApiActionHandler.java
+++ b/src/main/java/org/nlpcn/jcoder/run/mvc/ApiActionHandler.java
@@ -1,39 +1,43 @@
-package org.nlpcn.jcoder.run.mvc;
-
-import org.nlpcn.jcoder.run.mvc.processor.ApiActionInvoker;
-import org.nlpcn.jcoder.util.StaticValue;
-import org.nutz.mvc.ActionContext;
-import org.nutz.mvc.Mvcs;
-import org.nutz.mvc.NutConfig;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class ApiActionHandler {
-
- private NutConfig config;
-
-
- public ApiActionHandler(NutConfig conf) {
- this.config = conf;
- config.setUrlMapping(null);
- }
-
- public boolean handle(HttpServletRequest req, HttpServletResponse resp) {
-
- ActionContext ac = new ActionContext();
-
- ac.setRequest(req).setResponse(resp).setServletContext(config.getServletContext());
-
- Mvcs.setActionContext(ac);
-
- ApiActionInvoker invoker = StaticValue.MAPPING.getOrCreate(config, ac);
-
- if (null == invoker) {
- return false;
- }
- return invoker.invoke(ac);
-
- }
-
-}
+package org.nlpcn.jcoder.run.mvc;
+
+import javax.servlet.FilterConfig;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.nlpcn.commons.lang.util.StringUtil;
+import org.nlpcn.jcoder.run.mvc.processor.ApiActionInvoker;
+import org.nlpcn.jcoder.util.StaticValue;
+import org.nutz.mvc.ActionContext;
+import org.nutz.mvc.Mvcs;
+import org.nutz.mvc.NutConfig;
+import org.nutz.mvc.config.FilterNutConfig;
+
+public class ApiActionHandler {
+
+ private ApiUrlMappingImpl mapping;
+
+ private NutConfig config;
+
+ public ApiActionHandler(FilterConfig conf) {
+ this.config = new FilterNutConfig(conf);
+ this.mapping = StaticValue.MAPPING;
+ }
+
+ public boolean handle(HttpServletRequest req, HttpServletResponse resp) {
+
+ ActionContext ac = new ActionContext();
+
+ ac.setRequest(req).setResponse(resp).setServletContext(config.getServletContext());
+
+ Mvcs.setActionContext(ac);
+
+ ApiActionInvoker invoker = mapping.getOrCreate(config, ac);
+
+ if (null == invoker) {
+ return false;
+ }
+ return invoker.invoke(ac);
+
+ }
+
+}
diff --git a/src/main/java/org/nlpcn/jcoder/run/mvc/ApiLoadings.java b/src/main/java/org/nlpcn/jcoder/run/mvc/ApiLoadings.java
index c368445..d76a3a4 100644
--- a/src/main/java/org/nlpcn/jcoder/run/mvc/ApiLoadings.java
+++ b/src/main/java/org/nlpcn/jcoder/run/mvc/ApiLoadings.java
@@ -1,5 +1,13 @@
package org.nlpcn.jcoder.run.mvc;
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.nlpcn.jcoder.run.annotation.DefaultExecute;
import org.nlpcn.jcoder.run.annotation.Execute;
import org.nutz.ioc.annotation.InjectName;
import org.nutz.ioc.loader.annotation.IocBean;
@@ -13,15 +21,25 @@
import org.nutz.lang.util.Context;
import org.nutz.log.Log;
import org.nutz.log.Logs;
-import org.nutz.mvc.*;
-import org.nutz.mvc.annotation.*;
-
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import org.nutz.mvc.ActionFilter;
+import org.nutz.mvc.ActionInfo;
+import org.nutz.mvc.HttpAdaptor;
+import org.nutz.mvc.Mvcs;
+import org.nutz.mvc.NutConfig;
+import org.nutz.mvc.ObjectInfo;
+import org.nutz.mvc.annotation.AdaptBy;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.By;
+import org.nutz.mvc.annotation.Chain;
+import org.nutz.mvc.annotation.DELETE;
+import org.nutz.mvc.annotation.Encoding;
+import org.nutz.mvc.annotation.Fail;
+import org.nutz.mvc.annotation.Filters;
+import org.nutz.mvc.annotation.GET;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.POST;
+import org.nutz.mvc.annotation.PUT;
+import org.nutz.mvc.annotation.PathMap;
public abstract class ApiLoadings {
@@ -31,7 +49,7 @@ public static ActionInfo createInfo(Class type) {
ActionInfo ai = new ActionInfo();
evalEncoding(ai, Mirror.getAnnotationDeep(type, Encoding.class));
evalHttpAdaptor(ai, Mirror.getAnnotationDeep(type, AdaptBy.class));
- evalActionFilters(ai, Mirror.getAnnotationDeep(type, Filters.class), null);
+ evalActionFilters(ai, Mirror.getAnnotationDeep(type, Filters.class));
evalPathMap(ai, Mirror.getAnnotationDeep(type, PathMap.class));
evalOk(ai, Mirror.getAnnotationDeep(type, Ok.class));
evalFail(ai, Mirror.getAnnotationDeep(type, Fail.class));
@@ -55,14 +73,129 @@ public static ActionInfo createInfo(Method method) {
ActionInfo ai = new ActionInfo();
evalEncoding(ai, Mirror.getAnnotationDeep(method, Encoding.class));
evalHttpAdaptor(ai, Mirror.getAnnotationDeep(method, AdaptBy.class));
- evalActionFilters(ai, Mirror.getAnnotationDeep(method.getDeclaringClass(), Filters.class), Mirror.getAnnotationDeep(method, Filters.class));
+ evalActionFilters(ai, Mirror.getAnnotationDeep(method, Filters.class));
evalActionChainMaker(ai, Mirror.getAnnotationDeep(method, Chain.class));
- evalHttpMethod(ai, method, Mirror.getAnnotationDeep(method, Execute.class));
+ evalHttpMethod(ai, method, Mirror.getAnnotationDeep(method, Execute.class), Mirror.getAnnotationDeep(method, DefaultExecute.class));
ai.setMethod(method);
return ai;
}
- public static void evalHttpMethod(ActionInfo ai, Method method, Execute execute) {
+ // public static Set> scanModules(Ioc ioc, Class mainModule) {
+ // Modules ann = mainModule.getAnnotation(Modules.class);
+ // boolean scan = null == ann ? true : ann.scanPackage();
+ // // 准备扫描列表
+ // Set> forScans = new HashSet>();
+ //
+ // // 准备存放模块类的集合
+ // Set> modules = new HashSet>();
+ //
+ // // 添加主模块，简直是一定的
+ // forScans.add(mainModule);
+ //
+ // // 根据配置，扩展扫描列表
+ // if (null != ann) {
+ // // 指定的类，这些类可以作为种子类，如果 ann.scanPackage 为 true 还要递归搜索所有子包
+ // for (Class module : ann.value()) {
+ // forScans.add(module);
+ // }
+ //
+ // // 如果定义了扩展扫描接口 ...
+ // for (String str : ann.by()) {
+ // ModuleScanner ms;
+ // // 扫描器来自 Ioc 容器
+ // if (str.startsWith("ioc:")) {
+ // String nm = str.substring("ioc:".length());
+ // ms = ioc.get(ModuleScanner.class, nm);
+ // }
+ // // 扫描器直接无参创建
+ // else {
+ // try {
+ // Class klass = Lang.loadClass(str);
+ // Mirror mi = Mirror.me(klass);
+ // ms = (ModuleScanner) mi.born();
+ // }
+ // catch (ClassNotFoundException e) {
+ // throw Lang.wrapThrow(e);
+ // }
+ // }
+ // // 执行扫描，并将结果计入搜索结果
+ // Collection> col = ms.scan();
+ // if (null != col)
+ // for (Class type : col) {
+ // if (isModule(type)) {
+ // modules.add(type);
+ // }
+ // }
+ // }
+ //
+ // // 扫描包，扫描出的类直接计入结果
+ // if (ann.packages() != null && ann.packages().length > 0) {
+ // for (String packageName : ann.packages()) {
+ // scanModuleInPackage(modules, packageName);
+ // }
+ // }
+ // }
+ //
+ // for (Class type : forScans) {
+ // // mawm 为了兼容maven,根据这个type来加载该type所在jar的加载
+ // try {
+ // URL location = type.getProtectionDomain().getCodeSource().getLocation();
+ // if (log.isDebugEnabled())
+ // log.debugf("module class location '%s'", location);
+ // }
+ // catch (NullPointerException e) {
+ // // Android上无法拿到getProtectionDomain,just pass
+ // }
+ // Scans.me().registerLocation(type);
+ // }
+ //
+ // // 执行扫描
+ // for (Class type : forScans) {
+ // // 扫描子包
+ // if (scan) {
+ // scanModuleInPackage(modules, type.getPackage().getName());
+ // }
+ // // 仅仅加载自己
+ // else {
+ // if (isModule(type)) {
+ // if (log.isDebugEnabled())
+ // log.debugf(" > add '%s'", type.getName());
+ // modules.add(type);
+ // } else if (log.isTraceEnabled()) {
+ // log.tracef(" > ignore '%s'", type.getName());
+ // }
+ // }
+ // }
+ // return modules;
+ // }
+
+ // protected static void scanModuleInPackage(Set> modules, String
+ // packageName) {
+ // if (log.isDebugEnabled())
+ // log.debugf(" > scan '%s'", packageName);
+ //
+ // List> subs = Scans.me().scanPackage(packageName);
+ // checkModule(modules, subs);
+ // }
+
+ // /**
+ // * @param modules
+ // * @param subs
+ // */
+ // private static void checkModule(Set> modules, List>
+ // subs) {
+ // for (Class sub : subs) {
+ // if (isModule(sub)) {
+ // if (log.isDebugEnabled())
+ // log.debugf(" >> add '%s'", sub.getName());
+ // modules.add(sub);
+ // } else if (log.isTraceEnabled()) {
+ // log.tracef(" >> ignore '%s'", sub.getName());
+ // }
+ // }
+ // }
+
+ public static void evalHttpMethod(ActionInfo ai, Method method, Execute execute, DefaultExecute de) {
if (Mirror.getAnnotationDeep(method, GET.class) != null)
ai.getHttpMethods().add("GET");
if (Mirror.getAnnotationDeep(method, POST.class) != null)
@@ -72,11 +205,16 @@ public static void evalHttpMethod(ActionInfo ai, Method method, Execute execute)
if (Mirror.getAnnotationDeep(method, DELETE.class) != null)
ai.getHttpMethods().add("DELETE");
- if (execute != null) {
+ if (execute != null){
for (String m : execute.methods()) {
ai.getHttpMethods().add(m.toUpperCase());
}
}
+ if (de != null){
+ for (String m : de.methods()) {
+ ai.getHttpMethods().add(m.toUpperCase());
+ }
+ }
}
public static void evalActionChainMaker(ActionInfo ai, Chain cb) {
@@ -140,24 +278,18 @@ public static void evalModule(ActionInfo ai, Class type) {
ai.setInjectName(beanName);
}
- @SuppressWarnings({"unchecked", "rawtypes"})
- public static void evalActionFilters(ActionInfo ai, Filters classFilters, Filters filters) {
- List> list = new ArrayList>();
- if (null != classFilters) {
- for (By by : classFilters.value()) {
- list.add(new ObjectInfo(by.type(), by.args()));
- }
- }
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ public static void evalActionFilters(ActionInfo ai, Filters filters) {
if (null != filters) {
+ List> list = new ArrayList>(filters.value().length);
for (By by : filters.value()) {
list.add(new ObjectInfo(by.type(), by.args()));
}
+ ai.setFilterInfos(list.toArray(new ObjectInfo[list.size()]));
}
- ai.setFilterInfos(list.toArray(new ObjectInfo[list.size()]));
-
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public static void evalHttpAdaptor(ActionInfo ai, AdaptBy ab) {
if (null != ab) {
ai.setAdaptorInfo((ObjectInfo) new ObjectInfo(ab.type(), ab.args()));
diff --git a/src/main/java/org/nlpcn/jcoder/run/mvc/ApiPairAdaptor.java b/src/main/java/org/nlpcn/jcoder/run/mvc/ApiPairAdaptor.java
index a7ff14d..63e9bb9 100644
--- a/src/main/java/org/nlpcn/jcoder/run/mvc/ApiPairAdaptor.java
+++ b/src/main/java/org/nlpcn/jcoder/run/mvc/ApiPairAdaptor.java
@@ -1,122 +1,46 @@
package org.nlpcn.jcoder.run.mvc;
-import org.nutz.filepool.FilePool;
-import org.nutz.filepool.UU32FilePool;
-import org.nutz.ioc.Ioc;
-import org.nutz.json.Json;
-import org.nutz.lang.Lang;
-import org.nutz.lang.Mirror;
-import org.nutz.lang.Strings;
-import org.nutz.log.Log;
-import org.nutz.log.Logs;
-import org.nutz.mvc.Mvcs;
-import org.nutz.mvc.Scope;
-import org.nutz.mvc.ViewModel;
-import org.nutz.mvc.adaptor.PairAdaptor;
-import org.nutz.mvc.adaptor.ParamInjector;
-import org.nutz.mvc.adaptor.Params;
-import org.nutz.mvc.adaptor.injector.*;
-import org.nutz.mvc.annotation.*;
-import org.nutz.mvc.impl.AdaptorErrorContext;
-import org.nutz.mvc.upload.FastUploading;
-import org.nutz.mvc.upload.UploadException;
-import org.nutz.mvc.upload.UploadingContext;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
import java.io.InputStream;
import java.io.Reader;
import java.lang.annotation.Annotation;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Method;
import java.lang.reflect.Parameter;
-import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
-import java.util.Map;
-
-public class ApiPairAdaptor extends PairAdaptor {
-
- private static final Log log = Logs.get();
-
- protected UploadingContext uploadCtx;
- public ApiPairAdaptor() {
- this("");
- }
-
- public ApiPairAdaptor(String path) {
- String appRoot = Mvcs.getServletContext().getRealPath("/");
- if (appRoot == null) {
- appRoot = "";
- }
- if (path.isEmpty()) {
- path = "${app.root}/WEB-INF/tmp/nutzupload2";
- }
- if (path.contains("${app.root}")) {
- path = path.replace("${app.root}", appRoot);
- }
- try {
- uploadCtx = new UploadingContext(new UU32FilePool(path));
- } catch (Exception e) {
- log.error(e.getMessage());
- }
- }
-
- public ApiPairAdaptor(FilePool pool) {
- this(new UploadingContext(pool));
- }
-
- public ApiPairAdaptor(UploadingContext up) {
- uploadCtx = up;
- }
+import javax.servlet.ServletContext;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpSession;
- private static ParamInjector evalInjectorByAttrScope(Attr attr) {
- if (attr.scope() == Scope.APP)
- return new AppAttrInjector(attr.value());
- if (attr.scope() == Scope.SESSION)
- return new SessionAttrInjector(attr.value());
- if (attr.scope() == Scope.REQUEST)
- return new RequestAttrInjector(attr.value());
- return new AllAttrInjector(attr.value());
- }
+import org.nutz.ioc.Ioc;
+import org.nutz.mvc.Scope;
+import org.nutz.mvc.ViewModel;
+import org.nutz.mvc.adaptor.PairAdaptor;
+import org.nutz.mvc.adaptor.ParamInjector;
+import org.nutz.mvc.adaptor.injector.AllAttrInjector;
+import org.nutz.mvc.adaptor.injector.AppAttrInjector;
+import org.nutz.mvc.adaptor.injector.CookieInjector;
+import org.nutz.mvc.adaptor.injector.HttpInputStreamInjector;
+import org.nutz.mvc.adaptor.injector.HttpReaderInjector;
+import org.nutz.mvc.adaptor.injector.IocInjector;
+import org.nutz.mvc.adaptor.injector.IocObjInjector;
+import org.nutz.mvc.adaptor.injector.ReqHeaderInjector;
+import org.nutz.mvc.adaptor.injector.RequestAttrInjector;
+import org.nutz.mvc.adaptor.injector.RequestInjector;
+import org.nutz.mvc.adaptor.injector.ResponseInjector;
+import org.nutz.mvc.adaptor.injector.ServletContextInjector;
+import org.nutz.mvc.adaptor.injector.SessionAttrInjector;
+import org.nutz.mvc.adaptor.injector.SessionInjector;
+import org.nutz.mvc.adaptor.injector.ViewModelInjector;
+import org.nutz.mvc.annotation.Attr;
+import org.nutz.mvc.annotation.Cookie;
+import org.nutz.mvc.annotation.IocObj;
+import org.nutz.mvc.annotation.Param;
+import org.nutz.mvc.annotation.ReqHeader;
- private static ParamInjector evalInjectorByParamType(Class type) {
- // Request
- if (ServletRequest.class.isAssignableFrom(type)) {
- return new RequestInjector();
- }
- // Response
- else if (ServletResponse.class.isAssignableFrom(type)) {
- return new ResponseInjector();
- }
- // Session
- else if (HttpSession.class.isAssignableFrom(type)) {
- return new SessionInjector();
- }
- // ServletContext
- else if (ServletContext.class.isAssignableFrom(type)) {
- return new ServletContextInjector();
- }
- // Ioc
- else if (Ioc.class.isAssignableFrom(type)) {
- return new IocInjector();
- }
- // InputStream
- else if (InputStream.class.isAssignableFrom(type)) {
- return new HttpInputStreamInjector();
- }
- // Reader
- else if (Reader.class.isAssignableFrom(type)) {
- return new HttpReaderInjector();
- }
- // ViewModel
- else if (ViewModel.class.isAssignableFrom(type))
- return new ViewModelInjector();
- return null;
- }
+public class ApiPairAdaptor extends PairAdaptor {
@Override
public void init(Method method) {
@@ -124,25 +48,11 @@ public void init(Method method) {
argTypes = method.getParameterTypes();
injs = new ParamInjector[argTypes.length];
defaultValues = new String[argTypes.length];
- errCtxIndex = -1;
-
Annotation[][] annss = method.getParameterAnnotations();
Type[] types = method.getGenericParameterTypes();
Parameter[] parameters = method.getParameters();
for (int i = 0; i < annss.length; i++) {
-
- curIndex = i;
-
- // AdaptorErrorContext 类型的参数不需要生成注入器，记录下参数的下标就好了
- if (AdaptorErrorContext.class.isAssignableFrom(argTypes[i])) {
- // 多个 AdaptorErrorContext 类型的参数时，以第一个为准
- if (errCtxIndex == -1)
- errCtxIndex = i;
-
- continue;
- }
-
Annotation[] anns = annss[i];
Param param = null;
Attr attr = null;
@@ -197,7 +107,7 @@ public void init(Method method) {
if (param == null) {
-
+
final String paramName = parameters[i].getName();
param = new Param() {
@@ -222,11 +132,6 @@ public String df() {
return "//NOT EXIST IN//";
}
- @Override
- public String locale() {
- return "";
- }
-
@Override
public boolean array_auto_split() {
return true;
@@ -244,82 +149,54 @@ public boolean array_auto_split() {
}
if (param != null) {
String tmp = param.df();
- if (tmp != null && !tmp.equals(Params.ParamDefaultTag))
+ if (tmp != null && !tmp.equals(ParamDefailtTag))
defaultValues[i] = tmp;
}
}
}
- protected ParamInjector evalInjectorBy(Type type, Param param) {
- // TODO 这里的实现感觉很丑, 感觉可以直接用type进行验证与传递
- // TODO 这里将Type的影响局限在了 github issue #30 中提到的局部范围
- Class clazz = Lang.getTypeClass(type);
- if (null == clazz) {
- if (log.isWarnEnabled())
- log.warnf("!!Fail to get Type Class : type=%s , param=%s", type, param);
- return null;
- }
-
- Type[] paramTypes = null;
- if (type instanceof ParameterizedType)
- paramTypes = ((ParameterizedType) type).getActualTypeArguments();
+ private static ParamInjector evalInjectorByAttrScope(Attr attr) {
+ if (attr.scope() == Scope.APP)
+ return new AppAttrInjector(attr.value());
+ if (attr.scope() == Scope.SESSION)
+ return new SessionAttrInjector(attr.value());
+ if (attr.scope() == Scope.REQUEST)
+ return new RequestAttrInjector(attr.value());
+ return new AllAttrInjector(attr.value());
+ }
- // 没有声明 @Param 且 clazz 是POJO的话，使用".."
- // 没有声明 @Param 且 clazz 不是POJO的话，使用方法的参数名称
- // 其它情况就使用 param.value() 的值
- String pm = null == param ? (Mirror.me(clazz).isPojo() ? ".." : getParamRealName(curIndex)) : param.value();
- if (pm == null) {
- pm = "arg" + curIndex;
+ private static ParamInjector evalInjectorByParamType(Class type) {
+ // Request
+ if (ServletRequest.class.isAssignableFrom(type)) {
+ return new RequestInjector();
}
- String defaultValue = null == param || Params.ParamDefaultTag.equals(param.df()) ? null : param.df();
- String datefmt = null == param ? "" : param.dfmt();
- boolean array_auto_split = null == param || param.array_auto_split();
- // POJO
- if ("..".equals(pm)) {
- if (Map.class.isAssignableFrom(clazz)) {
- return new MapPairInjector(type);
- }
- return new ObjectPairInjector(null, type);
+ // Response
+ else if (ServletResponse.class.isAssignableFrom(type)) {
+ return new ResponseInjector();
}
- // POJO with prefix
- else if (pm != null && pm.startsWith("::")) {
- if (pm.length() > 2)
- return new ObjectNavlPairInjector(pm.substring(2), type);
- return new ObjectNavlPairInjector(null, type);
+ // Session
+ else if (HttpSession.class.isAssignableFrom(type)) {
+ return new SessionInjector();
}
- // POJO[]
- else if (clazz.isArray()) {
- return new ArrayInjector(pm,
- null,
- type,
- paramTypes,
- defaultValue,
- array_auto_split);
+ // ServletContext
+ else if (ServletContext.class.isAssignableFrom(type)) {
+ return new ServletContextInjector();
}
-
- // Name-value
- return getNameInjector(pm, datefmt, type, paramTypes, defaultValue);
- }
-
- protected Object getReferObject(ServletContext sc, HttpServletRequest req, HttpServletResponse resp, String[] pathArgs) {
- String type = req.getHeader("Content-Type");
- if (!Strings.isBlank(type)) {
- if (type.contains("json")) { // JSON适配器
- try {
- return Json.fromJson(req.getReader());
- } catch (Exception e) {
- throw Lang.wrapThrow(e);
- }
- }
- if (type.contains("multipart/form-data")) { // 上传适配器
- FastUploading uploading = new FastUploading();
- try {
- return uploading.parse(req, uploadCtx);
- } catch (UploadException e) {
- throw Lang.wrapThrow(e);
- }
- }
+ // Ioc
+ else if (Ioc.class.isAssignableFrom(type)) {
+ return new IocInjector();
+ }
+ // InputStream
+ else if (InputStream.class.isAssignableFrom(type)) {
+ return new HttpInputStreamInjector();
}
- return super.getReferObject(sc, req, resp, pathArgs);
+ // Reader
+ else if (Reader.class.isAssignableFrom(type)) {
+ return new HttpReaderInjector();
+ }
+ // ViewModel
+ else if (ViewModel.class.isAssignableFrom(type))
+ return new ViewModelInjector();
+ return null;
}
}
diff --git a/src/main/java/org/nlpcn/jcoder/run/mvc/ApiUrlMappingImpl.java b/src/main/java/org/nlpcn/jcoder/run/mvc/ApiUrlMappingImpl.java
index 1c2f94a..03409ad 100644
--- a/src/main/java/org/nlpcn/jcoder/run/mvc/ApiUrlMappingImpl.java
+++ b/src/main/java/org/nlpcn/jcoder/run/mvc/ApiUrlMappingImpl.java
@@ -1,273 +1,268 @@
-package org.nlpcn.jcoder.run.mvc;
-
-import org.nlpcn.jcoder.domain.CodeInfo;
-import org.nlpcn.jcoder.domain.CodeInfo.ExecuteMethod;
-import org.nlpcn.jcoder.domain.Task;
-import org.nlpcn.jcoder.run.java.JavaRunner;
-import org.nlpcn.jcoder.run.mvc.processor.ApiActionInvoker;
-import org.nlpcn.jcoder.service.TaskService;
-import org.nlpcn.jcoder.util.ExceptionUtil;
-import org.nlpcn.jcoder.util.StaticValue;
-import org.nutz.http.Http;
-import org.nutz.lang.Lang;
-import org.nutz.lang.Strings;
-import org.nutz.log.Log;
-import org.nutz.log.Logs;
-import org.nutz.mvc.*;
-import org.nutz.mvc.annotation.BlankAtException;
-import org.nutz.mvc.impl.ActionInvoker;
-import org.nutz.mvc.impl.Loadings;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-public class ApiUrlMappingImpl implements UrlMapping {
-
- private static final Log log = Logs.get();
-
- protected Map map;
-
- private Map lockMap = new HashMap<>();
-
- public ApiUrlMappingImpl() {
- this.map = new ConcurrentHashMap();
- }
-
- public void add(ActionChainMaker maker, ActionInfo ai, NutConfig config) {
-
- // 检查所有的path
- String[] paths = ai.getPaths();
- for (int i = 0; i < paths.length; i++) {
- String path = paths[i];
- if (Strings.isBlank(path))
- throw new BlankAtException(ai.getModuleType(), ai.getMethod());
-
- if (path.charAt(0) != '/')
- paths[i] = '/' + path;
- }
-
- ActionChain chain = maker.eval(config, ai);
-
- for (String path : ai.getPaths()) {
-
- // 尝试获取，看看有没有创建过这个 URL 调用者
- ApiActionInvoker invoker = map.get(path);
-
- // 如果没有增加过这个 URL 的调用者，为其创建备忘记录，并加入索引
- if (null == invoker) {
- invoker = new ApiActionInvoker();
- map.put(path, invoker);
- // 记录一下方法与 url 的映射
- config.getAtMap().addMethod(path, ai.getMethod());
- }
-
- // 将动作链，根据特殊的 HTTP 方法，保存到调用者内部
- invoker.setDefaultChain(chain);
-
- }
-
- printActionMapping(ai);
-
- // TODO 下面个IF要不要转换到NutLoading中去呢?
- // 记录一个 @At.key
- if (!Strings.isBlank(ai.getPathKey()))
- config.getAtMap().add(ai.getPathKey(), ai.getPaths()[0]);
- }
-
- @Override
- public ActionInvoker get(ActionContext ac) {
- throw new RuntimeException(this.getClass() + " not support this function ! ");
- }
-
- public ApiActionInvoker getOrCreate(NutConfig config, ActionContext ac) {
- RequestPath rp = Mvcs.getRequestPathObject(ac.getRequest());
-
- String path = rp.getPath();
-
- int len = path.length();
-
- if (path.charAt(len - 1) == '/') {
- path = path.substring(0, len - 1);
- }
-
- ac.setSuffix(rp.getSuffix());
-
- ApiActionInvoker invoker = getOrCreate(config, path);
-
- if (invoker != null) {
- setActionSomeArgs(ac, path);
- ActionChain chain = invoker.getActionChain(ac);
- if (chain != null) {
- if (log.isDebugEnabled()) {
- log.debugf("Found mapping for [%s] path=%s : %s", ac.getRequest().getMethod(), path, chain);
- }
- return invoker;
- }
- }
- if (log.isDebugEnabled())
- log.debugf("Search mapping for path=%s : NOT Action match", path);
- return null;
- }
-
- /**
- * 获得一个ApiActionInvoker如果不存在则创建一个
- *
- * @param config
- * @param path
- * @return
- */
- private ApiActionInvoker getOrCreate(NutConfig config, String path) {
- ApiActionInvoker invoker = map.get(path);
- if (invoker == null) {
- Lock lock = null;
- synchronized (this) {
- lock = lockMap.getOrDefault(path, new ReentrantLock());
- }
- lock.lock();
- try {
- if ((invoker = map.get(path)) == null) {
- invoker = createInvoker(config, path);
- }
- } finally {
- lock.unlock();
- }
- }
- return invoker;
- }
-
- private void setActionSomeArgs(ActionContext ac, String path) {
- ac.setPath(path);
- ac.setPathArgs(new LinkedList());
- }
-
- private ApiActionInvoker createInvoker(NutConfig config, String path) {
-
- String[] split = path.split("/");
-
- if (split.length < 5) {
- throw new RuntimeException(path + " not match any class it must /api/[groupName]/[className]/[methodName]");
- }
-
- Task task = TaskService.findTaskByCache(split[2], split[3]);
-
- try {
- if (task != null && task.getStatus() == 1 && task.getType() == 1) {
-
- CodeInfo codeInfo = new JavaRunner(task).compile().instance().getTask().codeInfo();
-
- ApiActionChainMaker aacm = null;
-
- if (config != null) {
- aacm = Loadings.evalObj(config, ApiActionChainMaker.class, new String[]{});
- } else {
- aacm = new ApiActionChainMaker();
- }
-
- Class module = codeInfo.getClassz();
-
- for (ExecuteMethod method : codeInfo.getExecuteMethods()) {
- // 增加到映射中
- ActionInfo info = ApiLoadings.createInfo(method.getMethod());
-
- info.setModuleType(module);
-
- info.setPaths(new String[]{"/api/" + task.getGroupName() + "/" + task.getName() + "/" + method.getName()});
-
- this.add(aacm, info, config);
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException(ExceptionUtil.realException(e));
- }
-
- return map.get(path);
- }
-
- /**
- * 从映射表中删除一个api
- */
- public synchronized void remove(String groupName, String className) {
- synchronized (map) {
- Task task = TaskService.findTaskByCache(groupName, className);
- for (String path : map.keySet()) {
- if (path.startsWith("/api/" + groupName + "/" + task.getName() + "/")) {
- map.remove(path);
- log.info("remove api " + path);
- }
- }
- }
- }
-
- /**
- * 通过一个地址获取ActionInvoker
- *
- * @param className
- * @param methodName
- * @return
- */
- public ApiActionInvoker getOrCreateByUrl(String groupName, String className, String methodName) {
- String path = "/api/" + groupName + "/" + className + "/" + methodName;
- ApiActionInvoker apiActionInvoker = map.get(path);
-
- if (apiActionInvoker == null) { // 调用http接口进行渲染填充map
- //TODO: 这里可能不需要一次http请求
- Http.get("http://127.0.0.1:" + System.getProperty(StaticValue.PREFIX + "port") + path + "?_rpc_init=true");
- apiActionInvoker = map.get(path);
- }
-
- return apiActionInvoker;
- }
-
- /**
- * 删除全部访问地址,相当于全站reload
- */
- public void removeAll() {
- map.clear();
- }
-
- @Override
- public void add(String path, ActionInvoker invoker) {
- throw new RuntimeException(this.getClass() + " not support this function ! ");
- }
-
- protected void printActionMapping(ActionInfo ai) {
- /*
- * 打印基本调试信息
- */
- if (log.isDebugEnabled()) {
- // 打印路径
- String[] paths = ai.getPaths();
- StringBuilder sb = new StringBuilder();
- if (null != paths && paths.length > 0) {
- sb.append(" '").append(paths[0]).append("'");
- for (int i = 1; i < paths.length; i++)
- sb.append(", '").append(paths[i]).append("'");
- } else {
- throw Lang.impossible();
- }
- // 打印方法名
- Method method = ai.getMethod();
- String str;
- if (null != method)
- str = String.format("%-30s : %-10s", Lang.simpleMethodDesc(method), method.getReturnType().getSimpleName());
- else
- throw Lang.impossible();
- log.debugf("%s >> %50s | @Ok(%-5s) @Fail(%-5s) | by %d Filters | (I:%s/O:%s)",
- Strings.alignLeft(sb, 30, ' '),
- str,
- ai.getOkView(),
- ai.getFailView(),
- (null == ai.getFilterInfos() ? 0
- : ai.getFilterInfos().length),
- ai.getInputEncoding(),
- ai.getOutputEncoding());
- }
- }
-
-}
+package org.nlpcn.jcoder.run.mvc;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.nlpcn.jcoder.domain.CodeInfo;
+import org.nlpcn.jcoder.domain.CodeInfo.ExecuteMethod;
+import org.nlpcn.jcoder.domain.Task;
+import org.nlpcn.jcoder.run.java.JavaRunner;
+import org.nlpcn.jcoder.run.mvc.processor.ApiActionInvoker;
+import org.nlpcn.jcoder.service.TaskService;
+import org.nlpcn.jcoder.util.StaticValue;
+import org.nutz.http.Http;
+import org.nutz.lang.Lang;
+import org.nutz.lang.Strings;
+import org.nutz.log.Log;
+import org.nutz.log.Logs;
+import org.nutz.mvc.ActionChain;
+import org.nutz.mvc.ActionChainMaker;
+import org.nutz.mvc.ActionContext;
+import org.nutz.mvc.ActionInfo;
+import org.nutz.mvc.Mvcs;
+import org.nutz.mvc.NutConfig;
+import org.nutz.mvc.RequestPath;
+import org.nutz.mvc.UrlMapping;
+import org.nutz.mvc.annotation.BlankAtException;
+import org.nutz.mvc.config.FilterNutConfig;
+import org.nutz.mvc.impl.ActionInvoker;
+import org.nutz.mvc.impl.Loadings;
+
+public class ApiUrlMappingImpl implements UrlMapping {
+
+ private static final Log log = Logs.get();
+
+ protected Map map;
+
+ private Map lockMap = new HashMap<>();
+
+ public ApiUrlMappingImpl() {
+ this.map = new ConcurrentHashMap