Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

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

@@ -190,6 +190,18 @@ public class UsageLog extends BufferedLogable implements Serializable {
 		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.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();
+	}
+
 	public UsageLog(String title, String message, Long userUU, String ip, String code, Long key) {
 		this.enUU = 0L;
 		this.title = title;

src/main/java/com/uas/platform/b2c/common/account/v2/service/UserService.java

@@ -17,5 +17,5 @@ public interface UserService {
      *
      * @param uu
      */
-    void delete(Long uu);
+    void delete(Long uu, Long enuu);
 }

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/EnterpriseServiceImpl.java

@@ -47,9 +47,9 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         enterprise.setUu(Long.valueOf(userSpace.getDialectUID()));
         enterpriseDao.save(enterprise);
         if(null != oldenterprise) {
-            logger.log("更新企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()));
+            logger.log("更新企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getUu(), 0L);
         } else {
-            logger.log("新增企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()));
+            logger.log("新增企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getUu(), 0L);
         }
     }
 
@@ -62,7 +62,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
                 if(!CollectionUtils.isEmpty(users)) {
                     enterprise.setEnAdminuu(users.get(0).getUserUU());
                     enterpriseDao.save(enterprise);
-                    logger.log("更换管理员", enterprise.getEnName()+"," +users.get(0).getUserName() + "time:" + sdf.format(new Date()));
+                    logger.log("更换管理员", enterprise.getEnName()+"," +users.get(0).getUserName() + "time:" + sdf.format(new Date()), enterprise.getUu(), enterprise.getEnAdminuu());
                 }
             }
         }

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/UserServiceImpl.java

@@ -5,7 +5,6 @@ import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
 import com.uas.platform.b2c.common.account.dao.UserDao;
 import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.v2.service.UserService;
-import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Status;
@@ -48,32 +47,33 @@ public class UserServiceImpl implements UserService {
         List<com.uas.platform.b2c.common.account.model.User> oldUsers = userDao.findUserByUserUU(u.getUserUU());
         userDao.save(u);
         if(oldUsers.size() > 0) {
-            logger.log("更新用户信息", user.getDialectUID() + "time: " + sdf.format(new Date()));
+            logger.log("更新用户信息", user.getDialectUID() + "time: " + sdf.format(new Date()), enterprise.getUu(), u.getUserUU());
         } else {
             if(null != enterprise && null == enterprise.getEnAdminuu()) {
                 enterprise.setEnAdminuu(u.getUserUU());
                 enterpriseDao.save(enterprise);
-                logger.log("设置管理员", enterprise.getEnName() + "," + u.getUserName() + "time: " + sdf.format(new Date()));
+                logger.log("设置管理员", enterprise.getEnName() + "," + u.getUserName() + "time: " + sdf.format(new Date()), enterprise.getUu(), u.getUserUU());
             }
-            logger.log("新增用户信息", user.getDialectUID() + "time: " + sdf.format(new Date()));
+            logger.log("新增用户信息", user.getDialectUID() + "time: " + sdf.format(new Date()), enterprise.getUu(), u.getUserUU());
         }
     }
 
 
     @Override
-    public void delete(Long uu) {
+    public void delete(Long uu, Long enuu) {
         com.uas.platform.b2c.common.account.model.User user = userDao.findOne(uu);
-        if(null != user) {
-            if (user.getEnterprises().contains(SystemSession.getUser().getEnterprise())) {
-                user.removeEnterprise(SystemSession.getUser().getEnterprise());
+        Enterprise enterprise = enterpriseDao.findByUu(enuu);
+        if(null != user && null != enterprise) {
+            if (user.getEnterprises().contains(enterprise)) {
+                user.removeEnterprise(enterprise);
                 if (user.getEnterprises().size() != 0) {
                     user.setEnable((short) Status.DISABLED.value());
-                    logger.log("删除用户", "禁用" + user.getUserUU());
+                    logger.log("删除用户", "禁用" + user.getUserUU(), 0L, 0L);
                     userDao.save(user);
                 }
                 if (user.getEnterprises().size() == 0) {
                     userDao.delete(user);
-                    logger.log("删除用户", "删除" + user.getUserUU());
+                    logger.log("删除用户", "删除" + user.getUserUU(), 0L, 0L);
                 }
             }
         }

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

@@ -31,6 +31,18 @@ public class UsageBufferedLogger extends BufferedLogger<UsageLog> {
 		log(new UsageLog(title, message, null, null, null));
 	}
 
+	/**
+	 * 未登录记录平台使用日志
+	 *
+	 * @param title
+	 *            消息标题
+	 * @param message
+	 *            消息
+	 */
+	public void log(String title, String message, Long enuu, Long useruu) {
+		log(new UsageLog(title, message, null, null, null, enuu, useruu));
+	}
+
 	/**
 	 * 记录平台密码找回日志
 	 * 

src/main/resources/prod/sys.properties

@@ -18,10 +18,10 @@ enName=\u6DF1\u5733\u5E02\u4F18\u8F6F\u5546\u57CE\u79D1\u6280\u6709\u9650\u516C\
 
 # YesPay config
 yes_gateway=https://openapi.ysepay.com/gateway.do
-notifyURL=http://www.usoftmall.com/api/payment/ysepayNotify
-returnUrl=http://www.usoftmall.com/api/yesreturn
+notifyURL=https://www.usoftmall.com/api/payment/ysepayNotify
+returnUrl=https://www.usoftmall.com/api/yesreturn
 paymentPrice=prod
-orderProxyUrl=http://www.usoftmall.com/order/proxy
+orderProxyUrl=https://www.usoftmall.com/order/proxy
 #report url
 reportPrintUrl=http://print.ubtob.com/report/print?userName=B2C&profile=${profile}&reportName=%s&whereCondition=%s
 reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2C