|
diff --git a/javashop-eop/core/src/base/com/enation/app/base/core/action/AdminUserController.java b/javashop-eop/core/src/base/com/enation/app/base/core/action/AdminUserController.java
index b67438ab768155452d41fb960bb1b6ae2300a5de..26c54820825266102124c6afd2aefe42b26d232f 100644
--- a/javashop-eop/core/src/base/com/enation/app/base/core/action/AdminUserController.java
+++ b/javashop-eop/core/src/base/com/enation/app/base/core/action/AdminUserController.java
@@ -5,6 +5,10 @@ import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.UsernamePasswordToken;
+import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -75,6 +79,20 @@ public class AdminUserController {
HttpUtil.addCookie(httpResponse, "loginname", "", 0);
}
+
+ //=============start eop完成认证后，加入shiro身份验证 by tito
+ Subject subject = SecurityUtils.getSubject();
+ UsernamePasswordToken token = new UsernamePasswordToken(username, password);
+ try
+ {
+ subject.login(token);
+ }
+ catch (AuthenticationException e)
+ {
+ this.logger.error(e.getMessage(), e);
+ }
+ //=============end eop完成认证后，加入shiro身份验证
+
return JsonResultUtil.getSuccessJson("登陆成功");
} catch (Throwable exception) {
@@ -95,6 +113,20 @@ public class AdminUserController {
try {
WebSessionContext sessonContext = ThreadContextHolder.getSessionContext();
sessonContext.removeAttribute(UserConext.CURRENT_ADMINUSER_KEY);
+
+
+ //=============start eop完成退出后，shiro也退出 by tito
+ Subject subject = SecurityUtils.getSubject();
+ try
+ {
+ subject.logout();
+ }
+ catch (AuthenticationException e)
+ {
+ this.logger.error(e.getMessage(), e);
+ }
+ //=============end eop完成退出后，shiro也退出
+
return JsonResultUtil.getSuccessJson("成功注销");
} catch (Exception e) {
this.logger.error("管理员注销失败"+e.getMessage());
diff --git a/javashop-eop/core/src/base/com/enation/app/base/core/action/AuthController.java b/javashop-eop/core/src/base/com/enation/app/base/core/action/AuthController.java
index 131bf300996b547d45ab565aad10d2179c432703..97b5e66637ee016d0768e10e2e84c79c477785b1 100644
--- a/javashop-eop/core/src/base/com/enation/app/base/core/action/AuthController.java
+++ b/javashop-eop/core/src/base/com/enation/app/base/core/action/AuthController.java
@@ -2,8 +2,6 @@ package com.enation.app.base.core.action;
import java.util.List;
-import org.apache.struts2.convention.annotation.Result;
-import org.apache.struts2.convention.annotation.Results;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller;
diff --git a/javashop-eop/core/src/base/com/enation/app/base/core/action/BackendUiController.java b/javashop-eop/core/src/base/com/enation/app/base/core/action/BackendUiController.java
index 3d104f2947b1a9945a7e9020c642ec943c04581f..216bf89d1e7d438675e410b81e10963374085d0c 100644
--- a/javashop-eop/core/src/base/com/enation/app/base/core/action/BackendUiController.java
+++ b/javashop-eop/core/src/base/com/enation/app/base/core/action/BackendUiController.java
@@ -1,11 +1,14 @@
package com.enation.app.base.core.action;
+import java.util.HashMap;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView;
import com.enation.eop.resource.IAdminThemeManager;
@@ -122,4 +125,8 @@ public class BackendUiController {
return ctx;
}
+ @RequestMapping(value="/{errorPage}",method = RequestMethod.GET)
+ public String getLogin(@PathVariable("errorPage") String errorPage){
+ return "/adminthemes/"+this.getTheme()+"/" + errorPage;
+ }
}
diff --git a/javashop-eop/core/src/base/com/enation/app/base/core/action/CacheAction.java b/javashop-eop/core/src/base/com/enation/app/base/core/action/CacheAction.java
deleted file mode 100644
index 44af1fd4811ae25d985d460dd4378a02e685c8b7..0000000000000000000000000000000000000000
--- a/javashop-eop/core/src/base/com/enation/app/base/core/action/CacheAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.enation.app.base.core.action;
-
-import org.apache.struts2.convention.annotation.Action;
-import org.apache.struts2.convention.annotation.Namespace;
-import org.apache.struts2.convention.annotation.ParentPackage;
-import org.apache.struts2.convention.annotation.Result;
-import org.apache.struts2.convention.annotation.Results;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import com.enation.framework.action.WWAction;
-@Component
-@Scope("prototype")
-@ParentPackage("eop_default")
-@Namespace("/core/admin")
-@Action("jmsMessage")
-@Results({
- @Result(name="list", type="freemarker", location="/core/admin/cache/list.html")
-})
-public class CacheAction extends WWAction {
-
- public String execute(){
-// CacheManager manager = CacheManager.getInstance();
-// Cache cache = manager.getCache("widgetCache");
-// // cache.setStatisticsEnabled(true);
-// LiveCacheStatistics statistis = cache.getLiveCacheStatistics();
-// boolean memory =statistis.isStatisticsEnabled();
-//
- return "list";
- }
-
-}
diff --git a/javashop-eop/core/src/base/com/enation/app/base/core/action/CheckComponentAction.java b/javashop-eop/core/src/base/com/enation/app/base/core/action/CheckComponentAction.java
deleted file mode 100644
index b618c9f0e82c32715735ce1759f0df1e518e6d3f..0000000000000000000000000000000000000000
--- a/javashop-eop/core/src/base/com/enation/app/base/core/action/CheckComponentAction.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- *
- */
-package com.enation.app.base.core.action;
-
-import org.apache.struts2.convention.annotation.Namespace;
-import org.apache.struts2.convention.annotation.ParentPackage;
-
-import com.enation.framework.action.WWAction;
-import com.enation.framework.context.spring.SpringContextHolder;
-
-/**
- * 检测某组件Action
- * @author kingapex
- *2015-5-7
- * @author kanon 2015-9-24 version1.1 添加注释
- */
-@ParentPackage("eop_default")
-@Namespace("/core/admin")
-public class CheckComponentAction extends WWAction {
-
- private String id;
- /**
- * 根据bean id检测组件是否存在
- * @param id bean id
- * @return 组件是否存在
- */
- public String execute(){
- try {
- Object obj = SpringContextHolder.getBean(id);
- if(obj==null){
- this.showErrorJson("不存在");
- }else{
- this.showSuccessJson("存在");
- }
- } catch (Exception e) {
- this.showErrorJson("不存在");
- }
- return this.JSON_MESSAGE;
- }
- public String getId() {
- return id;
- }
- public void setId(String id) {
- this.id = id;
- }
-
-}
diff --git a/javashop-eop/core/src/base/com/enation/app/base/core/action/CkEditorUploadAction.java b/javashop-eop/core/src/base/com/enation/app/base/core/action/CkEditorUploadAction.java
deleted file mode 100644
index 5c7f4cb1f1d9974ca16193ba6d8d1d4183b2f678..0000000000000000000000000000000000000000
--- a/javashop-eop/core/src/base/com/enation/app/base/core/action/CkEditorUploadAction.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.enation.app.base.core.action;
-
-import java.io.File;
-
-import com.enation.eop.sdk.utils.UploadUtil;
-import com.enation.framework.action.WWAction;
-
-/**
- * ckeditor 文件上传
- * @author kingapex
- * 2010-7-11上午09:46:00
- * @author kanon 2015-9-24 version1.1 添加注释
- */
-public class CkEditorUploadAction extends WWAction {
- private File upload;
- private String uploadFileName;
- private String path;
- private String funcNum;
- /**
- * 上传文件
- * @param upload 文件
- * @param uploadFileName 文件夹名称
- */
- public String execute(){
- funcNum = this.getRequest().getParameter("CKEditorFuncNum");
- if(upload!=null && uploadFileName!=null){
- path = UploadUtil.upload(upload,uploadFileName,"ckeditor");
- path = UploadUtil.replacePath(path);
- }
- return this.SUCCESS;
-
- }
-
- public File getUpload() {
- return upload;
- }
-
- public void setUpload(File upload) {
- this.upload = upload;
- }
-
- public String getUploadFileName() {
- return uploadFileName;
- }
-
- public void setUploadFileName(String uploadFileName) {
- this.uploadFileName = uploadFileName;
- }
-
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
- public String getFuncNum() {
- return funcNum;
- }
-
- public void setFuncNum(String funcNum) {
- this.funcNum = funcNum;
- }
-
-
-}
diff --git a/javashop-eop/core/src/base/com/enation/app/base/core/action/ComponentController.java b/javashop-eop/core/src/base/com/enation/app/base/core/action/ComponentController.java
index 69e9fe9b1614c7307000c9f511678bbca6527318..1a049f414105d05541d902d8b72dac87c1017cc3 100644
--- a/javashop-eop/core/src/base/com/enation/app/base/core/action/ComponentController.java
+++ b/javashop-eop/core/src/base/com/enation/app/base/core/action/ComponentController.java
@@ -5,25 +5,17 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.struts2.convention.annotation.Action;
-import org.apache.struts2.convention.annotation.Namespace;
-import org.apache.struts2.convention.annotation.ParentPackage;
-import org.apache.struts2.convention.annotation.Result;
-import org.apache.struts2.convention.annotation.Results;
+import net.sf.json.JSONArray;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
-import net.sf.json.JSONArray;
-
import com.enation.eop.sdk.context.EopSetting;
import com.enation.framework.action.GridController;
-import com.enation.framework.action.GridJsonResult;
import com.enation.framework.action.JsonResult;
-import com.enation.framework.action.WWAction;
import com.enation.framework.component.ComponentView;
import com.enation.framework.component.IComponentManager;
import com.enation.framework.util.JsonResultUtil;
@@ -33,52 +25,53 @@ import com.enation.framework.util.JsonResultUtil;
* @author kingapex
* @version 2.0 maven版本升级改造 6.0 wangxin 2016-2-24
*/
-@Controller
+@Controller
@Scope("prototype")
@RequestMapping("/core/admin/component")
public class ComponentController extends GridController {
@Autowired
private IComponentManager componentManager;
+
/**
* 跳转至组件列表页面
* @return 组件列表页面
*/
- @RequestMapping(value="/list")
+ @RequestMapping(value = "/list")
public String list() {
return "/core/admin/component/list";
}
-
+
/**
* 获取组件列表JSON
* @param componentList 组件列表
* @return 组件列表JSON
*/
@ResponseBody
- @RequestMapping(value="/list-json")
+ @RequestMapping(value = "/list-json")
@SuppressWarnings({ "rawtypes", "unchecked" })
public String listJson() {
List - * 2009-12-30 上午11:01:08 - * - * @version 1.0 - */ -public class SiteAdminThemeAction extends WWAction { - - private IAdminThemeManager adminThemeManager; - private ISiteManager siteManager; - - private List- * 2009-12-30 上午11:01:08 - * - * @version 1.0 - * @author Kanon 2015-11-16 version 1.1 添加注释 - */ -public class SiteThemeAction extends WWAction { - - private List allMenus = menuManager.getMenuList();
+ Map |
|---|