Merge branch 'dev-mysql' into feature_release-tomysql

src/main/java/com/uas/platform/b2c/common/account/model/UsageLog.java

@@ -195,14 +195,14 @@ public class UsageLog extends BufferedLogable implements Serializable {
 	}
 
 	public String getUserTel() {
-		if(user.getUserTel()!=null){
+		if(user != null && user.getUserTel()!=null){
 			return user.getUserTel().substring(0,user.getUserTel().length()-(user.getUserTel().substring(3)).length())+"****"+user.getUserTel().substring(7);
 		}
 		return user.getUserTel();
 	}
 
 	public String getUserEmail() {
-		if(user.getUserEmail()!=null){
+		if(user != null && user.getUserEmail()!=null){
 			String email = user.getUserEmail();
 			int index = org.apache.commons.lang.StringUtils.indexOf(user.getUserEmail(), "@");
 			if (index <= 1)
@@ -225,27 +225,31 @@ public class UsageLog extends BufferedLogable implements Serializable {
 	}
 
 	public UsageLog(String title, String message, String detail, String code, Long key) {
-		this.enUU = SystemSession.getUser().getEnterprise() != null ? SystemSession.getUser().getEnterprise().getUu() : null;
 		this.title = title;
 		this.message = message;
 		this.detail = detail;
 		this.code = code;
 		this.key = key;
 		this.time = new Date().getTime();
-		this.userUU = SystemSession.getUser().getUserUU();
-		this.ip = SystemSession.getUser().getIp();
+		if(SystemSession.getUser() != null) {
+			this.userUU = SystemSession.getUser().getUserUU();
+			this.enUU = SystemSession.getUser().getEnterprise() != null ? SystemSession.getUser().getEnterprise().getUu() : null;
+			this.ip = SystemSession.getUser().getIp();
+		}
 	}
 
 	public UsageLog(String title, String message, String detail, String code, Long key, Long enuu, Long useruu) {
 		this.enUU = enuu;
+		this.userUU = useruu;
 		this.title = title;
 		this.message = message;
 		this.detail = detail;
 		this.code = code;
 		this.key = key;
 		this.time = new Date().getTime();
-		this.userUU = useruu;
-		this.ip = SystemSession.getUser().getIp();
+		if(SystemSession.getUser() != null) {
+			this.ip = SystemSession.getUser().getIp();
+		}
 	}
 
 	public UsageLog(String title, String message, Long userUU, String ip, String code, Long key) {

src/main/java/com/uas/platform/b2c/core/support/log/UsageBufferedLogger.java

@@ -28,7 +28,11 @@ public class UsageBufferedLogger extends BufferedLogger<UsageLog> {
 	 *            消息
 	 */
 	public void log(String title, String message) {
-		log(new UsageLog(title, message, null, null, null));
+		try {
+			log(new UsageLog(title, message, null, null, null));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
 
 	/**
@@ -40,7 +44,11 @@ public class UsageBufferedLogger extends BufferedLogger<UsageLog> {
 	 *            消息
 	 */
 	public void log(String title, String message, Long enuu, Long useruu) {
-		log(new UsageLog(title, message, null, null, null, enuu, useruu));
+		try {
+			log(new UsageLog(title, message, null, null, null, enuu, useruu));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
 
 	/**
@@ -52,7 +60,11 @@ public class UsageBufferedLogger extends BufferedLogger<UsageLog> {
 	 *            消息
 	 */
 	public void log(String title, String message, Long userUU, String ip) {
-		log(new UsageLog(title, message, userUU, ip, null, null));
+		try {
+			log(new UsageLog(title, message, userUU, ip, null, null));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
 
 	/**
@@ -66,7 +78,11 @@ public class UsageBufferedLogger extends BufferedLogger<UsageLog> {
 	 *            消息详细描述
 	 */
 	public void log(String title, String message, String description) {
-		log(new UsageLog(title, message, description, null, null));
+		try {
+			log(new UsageLog(title, message, description, null, null));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
 
 	/**
@@ -84,7 +100,11 @@ public class UsageBufferedLogger extends BufferedLogger<UsageLog> {
 	 *            相关单据主键
 	 */
 	public void log(String title, String message, String description, String relativeCode, Long relativeKey) {
-		log(new UsageLog(title, message, description, relativeCode, relativeKey));
+		try {
+			log(new UsageLog(title, message, description, relativeCode, relativeKey));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
 
 }

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -263,7 +263,7 @@ define([ 'app/app' ], function(app) {
 			});
 		};
 
-		function downloadByJs(url, keyword) {
+		function downloadByJs(url, keyword, type) {
 			var form = $("<form>");   //定义一个form表单
 			form.attr('style', 'display:none');   //在form表单中添加查询参数
 			form.attr('target', '');
@@ -274,10 +274,15 @@ define([ 'app/app' ], function(app) {
 			input1.attr('type', 'hidden');
 			input1.attr('name', 'keyword');
 			input1.attr('value', keyword);
+
+			var input2 = $('<input>');
 			input1.attr('type', 'hidden');
+			input1.attr('name', 'type');
+			input1.attr('value', type);
 
 			$('body').append(form);  //将表单放置在web中
 			form.append(input1);   //将查询参数控件提交到表单上
+			form.append(input2);   //将类型参数控件提交到表单上
 			form.submit();
 		}
 
@@ -288,9 +293,9 @@ define([ 'app/app' ], function(app) {
 				return;
 			}
 			if ('standard' == $scope.standard_tab)
-				downloadByJs('trade/products/template/standard', $scope.param.keyword);
+				downloadByJs('trade/products/template/download/type', $scope.param.keyword, 'standard');
 			if ('unstandard' == $scope.standard_tab)
-				downloadByJs('trade/products/template/unstandard', $scope.param.keyword);
+				downloadByJs('trade/products/template/download/type', $scope.param.keyword, 'nStandard');
 		};
 
 		//初始化页数信息

src/main/webapp/resources/view/usercenter/forstore/account_manager.html

@@ -88,7 +88,7 @@
 		<div class="rt_menu">
 			<span>您的个人信息</span>
 			<span class="fr" >
-				<button ng-if=" !updateState"  ng-click="changeToUpdate(true)">修改</button>
+				<!--<button ng-if=" !updateState"  ng-click="changeToUpdate(true)">修改</button>-->
 				<button ng-if=" updateState"  ng-click="saveUpdate()">保存</button>
 				<button ng-if="updateState" ng-click="changeToUpdate(false)" style="color: #f00">取消</button>
 			</span>