整理代码

src/com/jsh/action/asset/AssetAction.java

@@ -18,7 +18,7 @@ import org.springframework.dao.DataAccessException;
 import com.jsh.base.BaseAction;
 import com.jsh.base.Log;
 import com.jsh.constants.asset.AssetConstants;
-import com.jsh.exception.AmsException;
+import com.jsh.exception.JshException;
 import com.jsh.model.po.Asset;
 import com.jsh.model.po.Assetname;
 import com.jsh.model.po.Basicuser;
@@ -431,7 +431,7 @@ public class AssetAction extends BaseAction<AssetModel>
 			}
 				
 		}
-		catch (AmsException e)
+		catch (JshException e)
 		{
 			Log.errorFileSync(">>>>>>>>>>>>>>>>>>>导入excel表格信息异常", e);
 		}

src/com/jsh/action/asset/ReportAction.java

@@ -5,7 +5,7 @@ import java.util.Map;
 
 import com.jsh.base.BaseAction;
 import com.jsh.base.Log;
-import com.jsh.exception.AmsException;
+import com.jsh.exception.JshException;
 import com.jsh.model.po.Asset;
 import com.jsh.model.vo.asset.ReportModel;
 import com.jsh.service.asset.ReportIService;
@@ -33,7 +33,7 @@ public class ReportAction extends BaseAction<ReportModel>
             reportService.find(pageUtil,reportType.split("_")[0],reportType.split("_")[1]);
             model.getShowModel().setReportData(pageUtil.getPageList());
         } 
-        catch (AmsException e) 
+        catch (JshException e) 
         {
             Log.errorFileSync(">>>>>>>>>查找资产信息异常", e);
             model.getShowModel().setMsgTip("get report data exception");

src/com/jsh/action/basic/AppAction.java

@@ -22,7 +22,7 @@ import org.springframework.dao.DataAccessException;
 
 import com.jsh.base.BaseAction;
 import com.jsh.base.Log;
-import com.jsh.exception.AmsException;
+import com.jsh.exception.JshException;
 import com.jsh.model.po.App;
 import com.jsh.model.po.Logdetails;
 import com.jsh.model.vo.basic.AppModel;

src/com/jsh/action/basic/DepotAction.java

@@ -13,7 +13,7 @@ import org.springframework.dao.DataAccessException;
 
 import com.jsh.base.BaseAction;
 import com.jsh.base.Log;
-import com.jsh.exception.AmsException;
+import com.jsh.exception.JshException;
 import com.jsh.model.po.Depot;
 import com.jsh.model.po.Logdetails;
 import com.jsh.model.po.Role;

src/com/jsh/action/basic/FunctionsAction.java

@@ -13,7 +13,7 @@ import org.springframework.dao.DataAccessException;
 
 import com.jsh.base.BaseAction;
 import com.jsh.base.Log;
-import com.jsh.exception.AmsException;
+import com.jsh.exception.JshException;
 import com.jsh.model.po.App;
 import com.jsh.model.po.Functions;
 import com.jsh.model.po.Logdetails;

src/com/jsh/action/basic/RoleAction.java

@@ -13,7 +13,7 @@ import org.springframework.dao.DataAccessException;
 
 import com.jsh.base.BaseAction;
 import com.jsh.base.Log;
-import com.jsh.exception.AmsException;
+import com.jsh.exception.JshException;
 import com.jsh.model.po.App;
 import com.jsh.model.po.Role;
 import com.jsh.model.po.Logdetails;

src/com/jsh/action/basic/UserAction.java

@@ -41,6 +41,7 @@ public class UserAction extends BaseAction<UserModel>
 		try
 		{
 			password = Tools.md5Encryp(password);
+			System.out.println(password);
 		}
 		catch (NoSuchAlgorithmException e)
 		{
@@ -136,7 +137,7 @@ public class UserAction extends BaseAction<UserModel>
 		    user.setIsystem((short)1);
 		    user.setIsmanager((short)1);
 		    user.setLoginame(model.getLoginame());
-		    String password ="00000000";
+		    String password ="123456";
 		    //因密码用MD5加密，需要对密码进行转化
 		    try 
 		    {

src/com/jsh/action/materials/DepotItemAction.java

@@ -17,7 +17,7 @@ import org.springframework.dao.DataAccessException;
 import com.jsh.base.BaseAction;
 import com.jsh.base.Log;
 import com.jsh.constants.asset.AssetConstants;
-import com.jsh.exception.AmsException;
+import com.jsh.exception.JshException;
 import com.jsh.model.po.Asset;
 import com.jsh.model.po.DepotHead;
 import com.jsh.model.po.DepotItem;
@@ -348,7 +348,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
 				allNumber = "0";
 			}
 			allNumber = allNumber.replace(".0", "");
-		} catch (AmsException e) {
+		} catch (JshException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}

src/com/jsh/base/BaseAction.java

@@ -15,7 +15,7 @@ import com.jsh.model.po.Basicuser;
 import com.jsh.service.basic.LogIService;
 /**
  * struts2工具类
- * @author andy
+ * @author jishenghua
  * struts2 base action 一些常用方法获取
  */
 @SuppressWarnings("serial")