From 7849d7799c9ede8447a4d57c26e032e08c1eff74 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 08 Apr 2021 20:14:50 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/static/demoPage/soketLoginTest.html | 137 +++++
zq-erp/src/main/resources/templates/views/common/login.html | 298 +++++++++++
zq-erp/src/main/resources/static/images/dui.png | 0
zq-erp/src/main/java/com/matrix/component/websoket/WebSoketScanQrCodeLoginObserver.java | 66 ++
zq-erp/src/main/resources/static/js/plugin/qrcode.js | 614 ++++++++++++++++++++++++
zq-erp/src/main/java/com/matrix/system/common/dto/WebLoginDto.java | 32 +
zq-erp/src/main/java/com/matrix/system/common/authority/DefaultAuthorityManager.java | 3
zq-erp/src/main/resources/static/images/qrcodeBack.png | 0
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 3
zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml | 66 +-
zq-erp/src/main/resources/static/images/qrcode.png | 0
zq-erp/src/main/resources/static/js/systools/MBase.js | 13
zq-erp/src/main/java/com/matrix/system/common/authority/strategy/ScanQrCodeLogin.java | 82 +++
zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java | 68 --
zq-erp/src/main/java/com/matrix/component/websoket/ScanQrCodeLoginDto.java | 57 ++
zq-erp/src/main/java/com/matrix/config/WebSocketConfig.java | 1
zq-erp/src/main/java/com/matrix/component/websoket/WebSocketPushHandler.java | 4
zq-erp/src/main/resources/static/images/pc.png | 0
zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java | 4
zq-erp/src/main/resources/static/demoPage/soketTest.html | 2
20 files changed, 1,339 insertions(+), 111 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/component/websoket/ScanQrCodeLoginDto.java b/zq-erp/src/main/java/com/matrix/component/websoket/ScanQrCodeLoginDto.java
new file mode 100644
index 0000000..2eb5086
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/component/websoket/ScanQrCodeLoginDto.java
@@ -0,0 +1,57 @@
+package com.matrix.component.websoket;
+
+import lombok.Data;
+
+/**
+ * 扫码登录接收参数
+ */
+@Data
+public class ScanQrCodeLoginDto {
+
+ /**
+ * 登录操作 1.登录
+ */
+ public static final Integer LOGIN_OPERATION_LOGIN=1;
+
+ /**
+ * 登录操作 2取消登录
+ */
+ public static final Integer LOGIN_OPERATION_CANCEL=2;
+ /**
+ * 指令类型 1，已扫码
+ */
+ public static final Integer MSG_TYPE_SCAN=1;
+ /**
+ * 指令类型 2登录确认
+ */
+ public static final Integer MSG_TYPE_LOGIN=2;
+
+
+
+ /**
+ * 网页客户端id，浏览器生成
+ */
+ String webClientId;
+
+ /**
+ * 二维码登录key
+ */
+ String loginQrCodeKey;
+
+ /**
+ * app登录用户ID
+ */
+ Long appUserId;
+
+ /**
+ * 登录操作 1.登录，2取消登录
+ */
+ Integer loginOperation;
+
+ /**
+ * 指令类型 1，已扫码，2登录确认，
+ */
+ Integer msgType;
+
+
+}
diff --git a/zq-erp/src/main/java/com/matrix/component/websoket/WebSocketPushHandler.java b/zq-erp/src/main/java/com/matrix/component/websoket/WebSocketPushHandler.java
index aa53291..5344831 100644
--- a/zq-erp/src/main/java/com/matrix/component/websoket/WebSocketPushHandler.java
+++ b/zq-erp/src/main/java/com/matrix/component/websoket/WebSocketPushHandler.java
@@ -27,10 +27,12 @@
private static final List<WebSoketMessageObserver> observerList=new ArrayList<>();
+
public WebSocketPushHandler(){
LogUtil.info("WebSocketPushHandler初始化");
//注册观察者
- addObserver(new WebSoketMessageRabbitObserver());
+ //addObserver(new WebSoketMessageRabbitObserver());
+ addObserver(new WebSoketScanQrCodeLoginObserver());
}
/**
* 用户进入系统监听
diff --git a/zq-erp/src/main/java/com/matrix/component/websoket/WebSoketScanQrCodeLoginObserver.java b/zq-erp/src/main/java/com/matrix/component/websoket/WebSoketScanQrCodeLoginObserver.java
new file mode 100644
index 0000000..634493a
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/component/websoket/WebSoketScanQrCodeLoginObserver.java
@@ -0,0 +1,66 @@
+package com.matrix.component.websoket;
+
+import cn.hutool.crypto.SecureUtil;
+import net.sf.json.JSONObject;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 扫码登录soket处理类
+ * @author jyy
+ */
+public class WebSoketScanQrCodeLoginObserver implements WebSoketMessageObserver {
+
+
+ private static Map<String,Long> scanCash=new HashMap<>();
+
+
+ @Override
+ public void userConnection(WebSocketSession session) {
+
+ }
+
+ @Override
+ public void handleTextMessage(WebSocketSession session, TextMessage message) {
+
+
+ ScanQrCodeLoginDto commonMessage = (ScanQrCodeLoginDto) JSONObject.toBean(JSONObject.fromObject(message.getPayload()), ScanQrCodeLoginDto.class);
+
+ if(ScanQrCodeLoginDto.MSG_TYPE_LOGIN.equals(commonMessage.getMsgType())){
+ //todo 添加安全校验代码
+ scanCash.put(SecureUtil.md5(commonMessage.getLoginQrCodeKey()),commonMessage.getAppUserId());
+ JSONObject jsonObject=new JSONObject();
+ jsonObject.put("loginOperation",commonMessage.getLoginOperation());
+ jsonObject.put("msgType",commonMessage.getMsgType());
+ WebSocketPushHandler.sendMessageToUser(commonMessage.getWebClientId(), new TextMessage(jsonObject.toString()));
+ }else if(ScanQrCodeLoginDto.MSG_TYPE_SCAN.equals(commonMessage.getMsgType())){
+ JSONObject jsonObject=new JSONObject();
+ jsonObject.put("msgType",commonMessage.getMsgType());
+ WebSocketPushHandler.sendMessageToUser(commonMessage.getWebClientId(), new TextMessage(jsonObject.toString()));
+ }
+
+
+ }
+
+ @Override
+ public void afterConnectionClosed(WebSocketSession session, CloseStatus status) {
+
+ }
+
+ /**
+ * 获取扫码的用户id
+ * @param webClientId
+ * @return
+ */
+ public static Long getScanCashValue(String webClientId){
+ return scanCash.remove(SecureUtil.md5(webClientId));
+ }
+
+}
+
+
+
diff --git a/zq-erp/src/main/java/com/matrix/config/WebSocketConfig.java b/zq-erp/src/main/java/com/matrix/config/WebSocketConfig.java
index 56a21a4..aed2a7d 100644
--- a/zq-erp/src/main/java/com/matrix/config/WebSocketConfig.java
+++ b/zq-erp/src/main/java/com/matrix/config/WebSocketConfig.java
@@ -39,6 +39,7 @@
LogUtil.info("注册WebSocket处理类");
registry.addHandler(createWebSocketPushHandler(), "/webSocketServer")
.addInterceptors(createHhandshakeInterceptor()).setAllowedOrigins("*");
+
registry.addHandler(createWebSocketPushHandler(), "/sockjs/webSocketServer")
.addInterceptors(createHhandshakeInterceptor()).withSockJS();
diff --git a/zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java b/zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java
index 14b6089..5d429c1 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java
@@ -41,7 +41,7 @@
@Autowired
SysFunctionService sysFunctionService;
- public static final String USER_POWER_REDISKEY = "USER_POWER_";
+ public static final String USER_POWER_REDISKEY_APP = "USER_POWER_APP";
public static final String USERFUNCTION = "userFunction";
/** 用户所有路径权限的记录 **/
@@ -101,7 +101,7 @@
List<String> userUrlMapping = new ArrayList<>();
- String redisKey = USER_POWER_REDISKEY + SecureUtil.md5(user.getSuId()+"");
+ String redisKey = USER_POWER_REDISKEY_APP + SecureUtil.md5(user.getSuId()+"");
String cachedValue = redisClient.getCachedValue(redisKey);
if (StringUtils.isNotBlank(cachedValue)) {
//从缓存中获取用户权限
diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java
index 36b217c..18eb754 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java
@@ -13,9 +13,11 @@
import com.matrix.system.common.authority.DefaultAuthorityManager;
import com.matrix.system.common.authority.strategy.AccountPasswordLogin;
import com.matrix.system.common.authority.strategy.LoginStrategy;
+import com.matrix.system.common.authority.strategy.ScanQrCodeLogin;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.ProjExceptionDao;
+import com.matrix.system.common.dto.WebLoginDto;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.system.hive.statistics.StatisticsBusinessDataJob;
@@ -97,17 +99,22 @@
*
* 登录验证
* @author:姜友瑶
- * @param user
* @return 返回类型 AjaxResult
* @date 2016年8月30日
*/
@RequestMapping(value = "/dologin")
- public @ResponseBody AjaxResult dologin(SysUsers user) {
- long sqlStart = System.currentTimeMillis();
- decryptAccountAndPassword(user);
- LoginStrategy apLogin = new AccountPasswordLogin(user, sysUsersService);
+ public @ResponseBody AjaxResult dologin(WebLoginDto webLoginDto) {
- user = authorityManager.login(apLogin);
+ long sqlStart = System.currentTimeMillis();
+ SysUsers user=null;
+ if(WebLoginDto.ACCOUNT_LOGIN.equals(webLoginDto.getLoginType())){
+ user= decryptAccountAndPassword(webLoginDto);
+ LoginStrategy apLogin = new AccountPasswordLogin(user, sysUsersService);
+ user = authorityManager.login(apLogin);
+ }else {
+ ScanQrCodeLogin apLogin = new ScanQrCodeLogin( sysUsersService,webLoginDto.getLoginQrCodeKey());
+ user = authorityManager.login(apLogin);
+ }
if(user.getShopId()!=null){
@@ -155,28 +162,27 @@
* @author JIANGYOUYAO
* @email 935090232@qq.com
* @date 2017年12月11日
- * @param user
*/
- private void decryptAccountAndPassword(SysUsers user) {
+ private SysUsers decryptAccountAndPassword(WebLoginDto webLoginDto) {
String privateKey = WebUtil.getSessionAttribute(MatrixConstance.PRIVATE_KEY);
if (StringUtils.isBlank(privateKey)) {
throw new GlobleException(SystemErrorCode.REQUEST_INVALID);
}
-
+ SysUsers user=new SysUsers();
try {
// 账号解密
- byte[] acccountData = RSAUtils.decryptByPrivateKey(user.getSuAccount(), privateKey);
+ byte[] acccountData = RSAUtils.decryptByPrivateKey(webLoginDto.getSuAccount(), privateKey);
user.setSuAccount(new String(acccountData));
// 密码解密
- byte[] passWordData = RSAUtils.decryptByPrivateKey(user.getSuPassword(), privateKey);
+ byte[] passWordData = RSAUtils.decryptByPrivateKey(webLoginDto.getSuPassword(), privateKey);
user.setSuPassword(new String(passWordData));
} catch (Exception e) {
LogUtil.error("用户账号密码解密失败", e);
throw new GlobleException(SystemErrorCode.LOGIN_FAIL);
}
-
+ return user;
}
@@ -246,44 +252,6 @@
return "admin/hive/mobile/mobileLogin";
}
- }
-
-
- /**
- * 移动端登录
- * @param user
- * @return
- */
- @RequestMapping(value = "/doHiveMobilelogin")
- public @ResponseBody AjaxResult doHiveMobilelogin(SysUsers user) {
- long sqlStart = System.currentTimeMillis();
- decryptAccountAndPassword(user);
- LoginStrategy apLogin = new AccountPasswordLogin(user, sysUsersService);
- user = authorityManager.login(apLogin);
- // 获取该账户的岗位信息,并判断是否为店长
- if(user.getShopId()!=null){
- user.setShopName(sysShopInfoDao.selectById(user.getShopId()).getShopName());
- }
-
- AjaxResult result = new AjaxResult();
- authorityManager.initUserPower(result);
- result.setStatus(AjaxResult.STATUS_SUCCESS);
- LogUtil.info("#用户登录成功 账号={}#", user.getSuAccount());
- switch (user.getSuUserType()) {
- // 企业管理员
- case AppConstance.USER_TYPE_ADMIN:
- result.setPage(HIVE_MOBILE_REDIRECT_INDEX);
- break;
- // 企业用户
- case AppConstance.USER_TYPE_EMPLOYEE:
- result.setPage(HIVE_MOBILE_REDIRECT_INDEX);
- break;
- default:// 不能识别的用户
- result.setPage("common/redirect/404");
- }
- long endStart = System.currentTimeMillis();
- LogUtil.info("本次登录耗时#{}毫秒", (endStart-sqlStart)+"");
- return result;
}
@GetMapping(value = "/hiveMobileLoginOut")
diff --git a/zq-erp/src/main/java/com/matrix/system/common/authority/DefaultAuthorityManager.java b/zq-erp/src/main/java/com/matrix/system/common/authority/DefaultAuthorityManager.java
index c521ca6..4329524 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/authority/DefaultAuthorityManager.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/authority/DefaultAuthorityManager.java
@@ -35,6 +35,7 @@
private static final int DEFAULT_2 = 2;
public static final String USER_POWER_REDISKEY = "USER_POWER_";
+ public static final String USER_POWER_REDISKEY_PC = "USER_POWER_PC";
@Autowired
SysFunctionService sysFunctionService;
@@ -140,7 +141,7 @@
SysUsers sysUser = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- String redisKey = USER_POWER_REDISKEY + SecureUtil.md5(sysUser.getSuId()+"");
+ String redisKey = USER_POWER_REDISKEY_PC + SecureUtil.md5(sysUser.getSuId()+"");
String cachedValue = redisClient.getCachedValue(redisKey);
if (StringUtils.isNotBlank(cachedValue)) {
//从缓存中获取用户权限
diff --git a/zq-erp/src/main/java/com/matrix/system/common/authority/strategy/ScanQrCodeLogin.java b/zq-erp/src/main/java/com/matrix/system/common/authority/strategy/ScanQrCodeLogin.java
new file mode 100644
index 0000000..b9cd2ac
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/common/authority/strategy/ScanQrCodeLogin.java
@@ -0,0 +1,82 @@
+package com.matrix.system.common.authority.strategy;
+
+import com.matrix.component.websoket.WebSoketScanQrCodeLoginObserver;
+import com.matrix.core.constance.MatrixConstance;
+import com.matrix.core.exception.GlobleException;
+import com.matrix.core.tools.LogUtil;
+import com.matrix.core.tools.WebUtil;
+import com.matrix.system.common.bean.SysUserLoginRecord;
+import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.constance.AppConstance;
+import com.matrix.system.common.constance.AppMessageCode;
+import com.matrix.system.common.service.SysUsersService;
+
+import java.util.Date;
+
+/**
+ * 账号密码登录策略
+ *
+ * @author JIANGYOUYAO
+ * @email 935090232@qq.com
+ * @date 2017年12月9日
+ */
+public class ScanQrCodeLogin implements LoginStrategy {
+
+ private SysUsersService sysUsersService;
+
+
+ private String loginQrCodeKey;
+
+ public ScanQrCodeLogin(SysUsersService sysUsersService, String loginQrCodeKey) {
+
+ this.sysUsersService = sysUsersService;
+ this.loginQrCodeKey = loginQrCodeKey;
+ }
+
+ @Override
+ public Object login() {
+
+ Long loginUserId = WebSoketScanQrCodeLoginObserver.getScanCashValue(loginQrCodeKey);
+
+ if (loginUserId != null) {
+ SysUsers loginUser = sysUsersService.findById(loginUserId);
+ if (loginUser != null) {
+ addErrorLoginRecord(loginUser,AppConstance.LOGIN_SUCCESS);
+ return loginUser;
+ } else {
+ LogUtil.error("登录失败");
+ throw new GlobleException(AppMessageCode.User.ACCOUNT_NOT_EXIST);
+ }
+ }
+
+ LogUtil.error("登录失败");
+ throw new GlobleException(AppMessageCode.User.ACCOUNT_NOT_EXIST);
+ }
+
+
+ /**
+ * 添加登录记录
+ *
+ * @param loginUser
+ * @param loginResult
+ * @author JIANGYOUYAO
+ * @email 935090232@qq.com
+ * @date 2017年12月12日
+ */
+ private void addErrorLoginRecord(SysUsers loginUser, int loginResult) {
+
+ if (AppConstance.LOGIN_SUCCESS.equals(loginResult)) {
+ sysUsersService.cleanUserTodayErrorLoginTime(loginUser.getSuAccount());
+ }
+ SysUserLoginRecord loginRecord = new SysUserLoginRecord();
+ loginRecord.setCreateBy(MatrixConstance.SYSTEM_USER);
+ loginRecord.setUpdateBy(MatrixConstance.SYSTEM_USER);
+ loginRecord.setLrLoginTime(new Date());
+ loginRecord.setLrId(null);
+ loginRecord.setUserAccount(loginUser.getSuAccount());
+ loginRecord.setLrResult(loginResult);
+ loginRecord.setLrIp(WebUtil.getCustomerIp());
+ loginRecord.setLrValid(AppConstance.RECORD_VALID);
+ sysUsersService.addUserLoginRecord(loginRecord);
+ }
+}
diff --git a/zq-erp/src/main/java/com/matrix/system/common/dto/WebLoginDto.java b/zq-erp/src/main/java/com/matrix/system/common/dto/WebLoginDto.java
new file mode 100644
index 0000000..73561e3
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/common/dto/WebLoginDto.java
@@ -0,0 +1,32 @@
+package com.matrix.system.common.dto;
+
+import lombok.Data;
+
+@Data
+public class WebLoginDto {
+
+ public static final Integer ACCOUNT_LOGIN=1;
+
+ public static final Integer SCANQRCORD_LOGIN=2;
+
+
+ /**
+ * 账号
+ */
+ private String suAccount;
+
+ /**
+ * 密码
+ */
+ private String suPassword;
+
+ /**
+ * 登录方式1，账号密码，2扫码
+ */
+ private Integer loginType;
+ /**
+ * 终端标识
+ */
+ private String loginQrCodeKey;
+
+}
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
index 4aeb01e..77f19f6 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
@@ -680,7 +680,7 @@
ShoppingGoods goods = shoppingGoodsDao.selectById(goodsId);
flow.setFlowContent(goods.getName() + "等" + sourceOrder.getItems().size() + "件产品");
// 若是退款，则取负数
- if (Dictionary.ORDER_STATU_TK.equals(sourceOrder.getStatu())) {
+ if (SysOrder.ORDER_TYPE_REFUND == sourceOrder.getOrderType()) {
flow.setFlowType(SysOrderFlow.FLOW_TYPE_REFUND);
flow.setAmount(flow.getAmount().negate());
flow.setOrderId(sourceOrder.getOldOrderId());
@@ -1443,7 +1443,6 @@
sysOrder.setPayTime(now);
sysOrder.setOrderNo(codeService.getRefundOrderNo());
sysOrder.setZkTotal(-sysOrder.getZkTotal());
- sysOrder.setOrderType(SysOrder.ORDER_TYPE_REFUND);
//新增订单
sysOrderDao.insert(sysOrder);
//插入明细
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml
index 8100408..2cfc1a1 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml
@@ -624,63 +624,69 @@
select
#{item.beginTime} dataTime,
(select shop_short_name from sys_shop_info where id=#{shopId}) shopName,
- (select IFNULL(sum(amount),0) from sys_order_flow
- where <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]> and pay_method!='欠款'
+ (select IFNULL(sum(a.amount),0) from sys_order_flow a
+ inner join sys_order b on a.order_id=b.id and b.statu!='已取消'
+ where <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]> and a.pay_method!='欠款'
<if test="shopId != null">
- and shop_id=#{shopId}
+ and a.shop_id=#{shopId}
</if>
<if test="companyId != null">
- and company_id=#{companyId}
+ and a.company_id=#{companyId}
</if>
)totalPay,
- (select IFNULL(sum(amount),0) from sys_order_flow
- where pay_method not in ('储值卡', '欠款') and flow_type != '退款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
+ (select IFNULL(sum(a.amount),0) from sys_order_flow a
+ inner join sys_order b on a.order_id=b.id and b.statu!='已取消'
+ where a.pay_method not in ('储值卡', '欠款') and a.flow_type != '退款' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
<if test="shopId != null">
- and shop_id=#{shopId}
+ and a.shop_id=#{shopId}
</if>
<if test="companyId != null">
- and company_id=#{companyId}
+ and a.company_id=#{companyId}
</if>
) cashPay,
- (select IFNULL(sum(amount),0) from sys_order_flow
- where pay_method = '储值卡' and flow_type != '退款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
+ (select IFNULL(sum(a.amount),0) from sys_order_flow a
+ inner join sys_order b on a.order_id=b.id and b.statu!='已取消'
+ where a.pay_method = '储值卡' and a.flow_type != '退款' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
<if test="shopId != null">
- and shop_id=#{shopId}
+ and a.shop_id=#{shopId}
</if>
<if test="companyId != null">
- and company_id=#{companyId}
+ and a.company_id=#{companyId}
</if>
) cardPay,
- (select IFNULL(sum(amount),0) from sys_order_flow
- where pay_method = '欠款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
+ (select IFNULL(sum(a.amount),0) from sys_order_flow a
+ inner join sys_order b on a.order_id=b.id and b.statu!='已取消'
+ where a.pay_method = '欠款' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
<if test="shopId != null">
- and shop_id=#{shopId}
+ and a.shop_id=#{shopId}
</if>
<if test="companyId != null">
- and company_id=#{companyId}
+ and a.company_id=#{companyId}
</if>
) arrearsPay,
- (select IFNULL(sum(amount),0) from sys_order_flow
- where pay_method not in ('储值卡', '欠款') and flow_type = '退款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
+ (select IFNULL(sum(a.amount),0) from sys_order_flow a
+ inner join sys_order b on a.order_id=b.id and b.statu!='已取消'
+ where a.pay_method not in ('储值卡', '欠款') and a.flow_type = '退款' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
<if test="shopId != null">
- and shop_id=#{shopId}
+ and a.shop_id=#{shopId}
</if>
<if test="companyId != null">
- and company_id=#{companyId}
+ and a.company_id=#{companyId}
</if>
) refundCashPay,
- (select IFNULL(sum(amount),0) from sys_order_flow
- where pay_method in ('储值卡') and flow_type = '退款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
+ (select IFNULL(sum(a.amount),0) from sys_order_flow a
+ inner join sys_order b on a.order_id=b.id and b.statu!='已取消'
+ where a.pay_method in ('储值卡') and a.flow_type = '退款' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
<if test="shopId != null">
- and shop_id=#{shopId}
+ and a.shop_id=#{shopId}
</if>
<if test="companyId != null">
- and company_id=#{companyId}
+ and a.company_id=#{companyId}
</if>
) refundCardPay,
(select IFNULL(sum(zk_price*count),0) from sys_order_item a
inner join shopping_goods b on a.goods_id=b.id
- inner join sys_order c on a.ORDER_ID=c.id
+ inner join sys_order c on a.ORDER_ID=c.id and c.statu!='已取消'
where b.good_type='家居产品' and <![CDATA[ c.pay_time > #{item.beginTime} and c.pay_time < #{item.endTime}]]>
<if test="shopId != null">
and c.shop_id=#{shopId}
@@ -691,7 +697,7 @@
) productAchieve,
(select IFNULL(sum(zk_price*count),0) from sys_order_item a
inner join shopping_goods b on a.goods_id=b.id
- inner join sys_order c on a.ORDER_ID=c.id
+ inner join sys_order c on a.ORDER_ID=c.id and c.statu!='已取消'
where b.good_type!='家居产品' and <![CDATA[ c.pay_time > #{item.beginTime} and c.pay_time < #{item.endTime}]]>
<if test="shopId != null">
and c.shop_id=#{shopId}
@@ -700,12 +706,14 @@
and c.company_id=#{companyId}
</if>
) cardAchieve,
- (select IFNULL(sum(amount),0) from sys_order_flow where flow_type = '还款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
+ (select IFNULL(sum(a.amount),0) from sys_order_flow a
+ inner join sys_order b on a.order_id=b.id and b.statu!='已取消'
+ where a.flow_type = '还款' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
<if test="shopId != null">
- and shop_id=#{shopId}
+ and a.shop_id=#{shopId}
</if>
<if test="companyId != null">
- and company_id=#{companyId}
+ and a.company_id=#{companyId}
</if>
) refund,
(select IFNULL(count(1),0) from sys_order
diff --git a/zq-erp/src/main/resources/static/demoPage/soketLoginTest.html b/zq-erp/src/main/resources/static/demoPage/soketLoginTest.html
new file mode 100644
index 0000000..50de183
--- /dev/null
+++ b/zq-erp/src/main/resources/static/demoPage/soketLoginTest.html
@@ -0,0 +1,137 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+ <meta charset="utf-8">
+ <!-- 启用360浏览器的极速模式(webkit) -->
+ <meta name="renderer" content="webkit">
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+ <title>soketTest</title>
+ <link th:href="@{/images/}"
+ rel="SHORTCUT ICON">
+ <meta name="keywords"
+ content=""/>
+ <meta name="description"
+ content=""/>
+ <style type="text/css">
+ .row > div:nth-child(1) {
+ background: url(../../images/login-title.jpg) no-repeat;
+ background-size: 100% 100%;
+ height: 380px;
+ }
+
+ .row > div:nth-child(2) {
+ background: #fff;
+ height: 380px;
+ }
+ .download-bar {
+ margin-top: 15px;
+ color: #fff;
+ }
+
+ .download-bar a {
+ color: #fff;
+ margin: 0 5px;
+ }
+
+ .download-bar a:hover {
+ text-decoration: underline;
+ color: #fff;
+ }
+ </style>
+ <script>
+ var isoldIE = false;
+ if (navigator.userAgent.indexOf("MSIE") > 0) {
+ if (navigator.userAgent.indexOf("MSIE 6.0") > 0
+ || navigator.userAgent.indexOf("MSIE 7.0") > 0
+ || avigator.userAgent.indexOf("MSIE 8.0") > 0) {
+ isoldIE = true;
+ }
+ }
+ if (window.top !== window.self) {
+ window.top.location = window.location
+ }
+ ;
+ </script>
+ <script type="text/javascript"
+ th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
+ <script type="text/javascript" th:src="@{/js/systools/MBase.js}"></script>
+ <link th:href="@{/css/styleOne/login.min.css}" rel="stylesheet">
+
+</head>
+
+<body >
+<h3>hello socket</h3>
+<p>【sendMsg】：<div><input style="width: 700px;" id="sendMsg" name="sendMsg" type="text" value='{ "webClientId":"123", "loginQrCodeKey":"1231" "appUserId":"1010","msgType":"1","loginOperation":"1"}';></div>
+<p>
+</p>
+
+
+<p>操作:<div><button onclick="openSocket()">开启socket</button></div>
+<p>【操作】：<div><button onclick="sendMessage()">发送消息</button></div>
+<p>【操作】：<div><button onclick="colseSocket()">关闭连接</button></div>
+</body>
+<script type="text/javascript" th:src="@{/js/systools/MJsBase.js}"></script>
+ <script>
+
+ var socket;
+ function openSocket() {
+ if(typeof(WebSocket) == "undefined") {
+ console.log("您的浏览器不支持WebSocket");
+ }else{
+ console.log("您的浏览器支持WebSocket");
+ //实现化WebSocket对象，指定要连接的服务器地址与端口 建立连接
+
+ var socketUrl="ws://localhost:8080/webSocketServer?userId=123";
+ console.log(socketUrl);
+ if(socket!=null){
+ socket.close();
+ socket=null;
+ }
+ socket = new WebSocket(socketUrl);
+ //打开事件
+ socket.onopen = function() {
+ console.log("websocket已打开");
+ //socket.send("这是来自客户端的消息" + location.href + new Date());
+ };
+ //获得消息事件
+ socket.onmessage = function(msg) {
+ console.log("获得消息："+msg);
+ var serverMsg = msg.data;
+ console.log(serverMsg);
+
+ };
+ //关闭事件
+ socket.onclose = function() {
+ console.log("websocket已关闭");
+ };
+ //发生了错误事件
+ socket.onerror = function() {
+ console.log("websocket发生了错误");
+ }
+ }
+ }
+
+ function sendMessage() {
+ if(typeof(WebSocket) == "undefined") {
+ console.log("您的浏览器不支持WebSocket");
+ }else {
+ // console.log("您的浏览器支持WebSocket");
+ var sendMsg = document.getElementById('sendMsg').value;
+ //var msg = '{ "webClientId":"'+webClientId+'","appUserId":"'+appUserId+'"}';
+ console.log("发送消息"+sendMsg);
+ socket.send(sendMsg);
+
+ }
+ }
+ function colseSocket() {
+ if(typeof(WebSocket) == "undefined") {
+ console.log("您的浏览器不支持WebSocket");
+ }else {
+ socket.close();
+ }
+ }
+ </script>
+
+
+</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/static/demoPage/soketTest.html b/zq-erp/src/main/resources/static/demoPage/soketTest.html
index 4e4b932..d2f6b24 100644
--- a/zq-erp/src/main/resources/static/demoPage/soketTest.html
+++ b/zq-erp/src/main/resources/static/demoPage/soketTest.html
@@ -87,7 +87,7 @@
console.log("您的浏览器支持WebSocket");
//实现化WebSocket对象，指定要连接的服务器地址与端口 建立连接
var userId = document.getElementById('userId').value;
- var socketUrl="ws://192.168.111.175:8091/webSocketServer?userId="+userId;
+ var socketUrl="ws://localhost:8080/webSocketServer?userId="+userId;
console.log(socketUrl);
if(socket!=null){
socket.close();
diff --git a/zq-erp/src/main/resources/static/images/dui.png b/zq-erp/src/main/resources/static/images/dui.png
new file mode 100644
index 0000000..fa086b7
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/dui.png
Binary files differ
diff --git a/zq-erp/src/main/resources/static/images/pc.png b/zq-erp/src/main/resources/static/images/pc.png
new file mode 100644
index 0000000..7787899
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/pc.png
Binary files differ
diff --git a/zq-erp/src/main/resources/static/images/qrcode.png b/zq-erp/src/main/resources/static/images/qrcode.png
new file mode 100644
index 0000000..1d5d2fc
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/qrcode.png
Binary files differ
diff --git a/zq-erp/src/main/resources/static/images/qrcodeBack.png b/zq-erp/src/main/resources/static/images/qrcodeBack.png
new file mode 100644
index 0000000..2dd3faf
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/qrcodeBack.png
Binary files differ
diff --git a/zq-erp/src/main/resources/static/js/plugin/qrcode.js b/zq-erp/src/main/resources/static/js/plugin/qrcode.js
new file mode 100644
index 0000000..1b31fb1
--- /dev/null
+++ b/zq-erp/src/main/resources/static/js/plugin/qrcode.js
@@ -0,0 +1,614 @@
+/**
+ * @fileoverview
+ * - Using the 'QRCode for Javascript library'
+ * - Fixed dataset of 'QRCode for Javascript library' for support full-spec.
+ * - this library has no dependencies.
+ *
+ * @author davidshimjs
+ * @see <a href="http://www.d-project.com/" target="_blank">http://www.d-project.com/</a>
+ * @see <a href="http://jeromeetienne.github.com/jquery-qrcode/" target="_blank">http://jeromeetienne.github.com/jquery-qrcode/</a>
+ */
+var QRCode;
+
+(function () {
+ //---------------------------------------------------------------------
+ // QRCode for JavaScript
+ //
+ // Copyright (c) 2009 Kazuhiko Arase
+ //
+ // URL: http://www.d-project.com/
+ //
+ // Licensed under the MIT license:
+ // http://www.opensource.org/licenses/mit-license.php
+ //
+ // The word "QR Code" is registered trademark of
+ // DENSO WAVE INCORPORATED
+ // http://www.denso-wave.com/qrcode/faqpatent-e.html
+ //
+ //---------------------------------------------------------------------
+ function QR8bitByte(data) {
+ this.mode = QRMode.MODE_8BIT_BYTE;
+ this.data = data;
+ this.parsedData = [];
+
+ // Added to support UTF-8 Characters
+ for (var i = 0, l = this.data.length; i < l; i++) {
+ var byteArray = [];
+ var code = this.data.charCodeAt(i);
+
+ if (code > 0x10000) {
+ byteArray[0] = 0xF0 | ((code & 0x1C0000) >>> 18);
+ byteArray[1] = 0x80 | ((code & 0x3F000) >>> 12);
+ byteArray[2] = 0x80 | ((code & 0xFC0) >>> 6);
+ byteArray[3] = 0x80 | (code & 0x3F);
+ } else if (code > 0x800) {
+ byteArray[0] = 0xE0 | ((code & 0xF000) >>> 12);
+ byteArray[1] = 0x80 | ((code & 0xFC0) >>> 6);
+ byteArray[2] = 0x80 | (code & 0x3F);
+ } else if (code > 0x80) {
+ byteArray[0] = 0xC0 | ((code & 0x7C0) >>> 6);
+ byteArray[1] = 0x80 | (code & 0x3F);
+ } else {
+ byteArray[0] = code;
+ }
+
+ this.parsedData.push(byteArray);
+ }
+
+ this.parsedData = Array.prototype.concat.apply([], this.parsedData);
+
+ if (this.parsedData.length != this.data.length) {
+ this.parsedData.unshift(191);
+ this.parsedData.unshift(187);
+ this.parsedData.unshift(239);
+ }
+ }
+
+ QR8bitByte.prototype = {
+ getLength: function (buffer) {
+ return this.parsedData.length;
+ },
+ write: function (buffer) {
+ for (var i = 0, l = this.parsedData.length; i < l; i++) {
+ buffer.put(this.parsedData[i], 8);
+ }
+ }
+ };
+
+ function QRCodeModel(typeNumber, errorCorrectLevel) {
+ this.typeNumber = typeNumber;
+ this.errorCorrectLevel = errorCorrectLevel;
+ this.modules = null;
+ this.moduleCount = 0;
+ this.dataCache = null;
+ this.dataList = [];
+ }
+
+ QRCodeModel.prototype={addData:function(data){var newData=new QR8bitByte(data);this.dataList.push(newData);this.dataCache=null;},isDark:function(row,col){if(row<0||this.moduleCount<=row||col<0||this.moduleCount<=col){throw new Error(row+","+col);}
+ return this.modules[row][col];},getModuleCount:function(){return this.moduleCount;},make:function(){this.makeImpl(false,this.getBestMaskPattern());},makeImpl:function(test,maskPattern){this.moduleCount=this.typeNumber*4+17;this.modules=new Array(this.moduleCount);for(var row=0;row<this.moduleCount;row++){this.modules[row]=new Array(this.moduleCount);for(var col=0;col<this.moduleCount;col++){this.modules[row][col]=null;}}
+ this.setupPositionProbePattern(0,0);this.setupPositionProbePattern(this.moduleCount-7,0);this.setupPositionProbePattern(0,this.moduleCount-7);this.setupPositionAdjustPattern();this.setupTimingPattern();this.setupTypeInfo(test,maskPattern);if(this.typeNumber>=7){this.setupTypeNumber(test);}
+ if(this.dataCache==null){this.dataCache=QRCodeModel.createData(this.typeNumber,this.errorCorrectLevel,this.dataList);}
+ this.mapData(this.dataCache,maskPattern);},setupPositionProbePattern:function(row,col){for(var r=-1;r<=7;r++){if(row+r<=-1||this.moduleCount<=row+r)continue;for(var c=-1;c<=7;c++){if(col+c<=-1||this.moduleCount<=col+c)continue;if((0<=r&&r<=6&&(c==0||c==6))||(0<=c&&c<=6&&(r==0||r==6))||(2<=r&&r<=4&&2<=c&&c<=4)){this.modules[row+r][col+c]=true;}else{this.modules[row+r][col+c]=false;}}}},getBestMaskPattern:function(){var minLostPoint=0;var pattern=0;for(var i=0;i<8;i++){this.makeImpl(true,i);var lostPoint=QRUtil.getLostPoint(this);if(i==0||minLostPoint>lostPoint){minLostPoint=lostPoint;pattern=i;}}
+ return pattern;},createMovieClip:function(target_mc,instance_name,depth){var qr_mc=target_mc.createEmptyMovieClip(instance_name,depth);var cs=1;this.make();for(var row=0;row<this.modules.length;row++){var y=row*cs;for(var col=0;col<this.modules[row].length;col++){var x=col*cs;var dark=this.modules[row][col];if(dark){qr_mc.beginFill(0,100);qr_mc.moveTo(x,y);qr_mc.lineTo(x+cs,y);qr_mc.lineTo(x+cs,y+cs);qr_mc.lineTo(x,y+cs);qr_mc.endFill();}}}
+ return qr_mc;},setupTimingPattern:function(){for(var r=8;r<this.moduleCount-8;r++){if(this.modules[r][6]!=null){continue;}
+ this.modules[r][6]=(r%2==0);}
+ for(var c=8;c<this.moduleCount-8;c++){if(this.modules[6][c]!=null){continue;}
+ this.modules[6][c]=(c%2==0);}},setupPositionAdjustPattern:function(){var pos=QRUtil.getPatternPosition(this.typeNumber);for(var i=0;i<pos.length;i++){for(var j=0;j<pos.length;j++){var row=pos[i];var col=pos[j];if(this.modules[row][col]!=null){continue;}
+ for(var r=-2;r<=2;r++){for(var c=-2;c<=2;c++){if(r==-2||r==2||c==-2||c==2||(r==0&&c==0)){this.modules[row+r][col+c]=true;}else{this.modules[row+r][col+c]=false;}}}}}},setupTypeNumber:function(test){var bits=QRUtil.getBCHTypeNumber(this.typeNumber);for(var i=0;i<18;i++){var mod=(!test&&((bits>>i)&1)==1);this.modules[Math.floor(i/3)][i%3+this.moduleCount-8-3]=mod;}
+ for(var i=0;i<18;i++){var mod=(!test&&((bits>>i)&1)==1);this.modules[i%3+this.moduleCount-8-3][Math.floor(i/3)]=mod;}},setupTypeInfo:function(test,maskPattern){var data=(this.errorCorrectLevel<<3)|maskPattern;var bits=QRUtil.getBCHTypeInfo(data);for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<6){this.modules[i][8]=mod;}else if(i<8){this.modules[i+1][8]=mod;}else{this.modules[this.moduleCount-15+i][8]=mod;}}
+ for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<8){this.modules[8][this.moduleCount-i-1]=mod;}else if(i<9){this.modules[8][15-i-1+1]=mod;}else{this.modules[8][15-i-1]=mod;}}
+ this.modules[this.moduleCount-8][8]=(!test);},mapData:function(data,maskPattern){var inc=-1;var row=this.moduleCount-1;var bitIndex=7;var byteIndex=0;for(var col=this.moduleCount-1;col>0;col-=2){if(col==6)col--;while(true){for(var c=0;c<2;c++){if(this.modules[row][col-c]==null){var dark=false;if(byteIndex<data.length){dark=(((data[byteIndex]>>>bitIndex)&1)==1);}
+ var mask=QRUtil.getMask(maskPattern,row,col-c);if(mask){dark=!dark;}
+ this.modules[row][col-c]=dark;bitIndex--;if(bitIndex==-1){byteIndex++;bitIndex=7;}}}
+ row+=inc;if(row<0||this.moduleCount<=row){row-=inc;inc=-inc;break;}}}}};QRCodeModel.PAD0=0xEC;QRCodeModel.PAD1=0x11;QRCodeModel.createData=function(typeNumber,errorCorrectLevel,dataList){var rsBlocks=QRRSBlock.getRSBlocks(typeNumber,errorCorrectLevel);var buffer=new QRBitBuffer();for(var i=0;i<dataList.length;i++){var data=dataList[i];buffer.put(data.mode,4);buffer.put(data.getLength(),QRUtil.getLengthInBits(data.mode,typeNumber));data.write(buffer);}
+ var totalDataCount=0;for(var i=0;i<rsBlocks.length;i++){totalDataCount+=rsBlocks[i].dataCount;}
+ if(buffer.getLengthInBits()>totalDataCount*8){throw new Error("code length overflow. ("
+ +buffer.getLengthInBits()
+ +">"
+ +totalDataCount*8
+ +")");}
+ if(buffer.getLengthInBits()+4<=totalDataCount*8){buffer.put(0,4);}
+ while(buffer.getLengthInBits()%8!=0){buffer.putBit(false);}
+ while(true){if(buffer.getLengthInBits()>=totalDataCount*8){break;}
+ buffer.put(QRCodeModel.PAD0,8);if(buffer.getLengthInBits()>=totalDataCount*8){break;}
+ buffer.put(QRCodeModel.PAD1,8);}
+ return QRCodeModel.createBytes(buffer,rsBlocks);};QRCodeModel.createBytes=function(buffer,rsBlocks){var offset=0;var maxDcCount=0;var maxEcCount=0;var dcdata=new Array(rsBlocks.length);var ecdata=new Array(rsBlocks.length);for(var r=0;r<rsBlocks.length;r++){var dcCount=rsBlocks[r].dataCount;var ecCount=rsBlocks[r].totalCount-dcCount;maxDcCount=Math.max(maxDcCount,dcCount);maxEcCount=Math.max(maxEcCount,ecCount);dcdata[r]=new Array(dcCount);for(var i=0;i<dcdata[r].length;i++){dcdata[r][i]=0xff&buffer.buffer[i+offset];}
+ offset+=dcCount;var rsPoly=QRUtil.getErrorCorrectPolynomial(ecCount);var rawPoly=new QRPolynomial(dcdata[r],rsPoly.getLength()-1);var modPoly=rawPoly.mod(rsPoly);ecdata[r]=new Array(rsPoly.getLength()-1);for(var i=0;i<ecdata[r].length;i++){var modIndex=i+modPoly.getLength()-ecdata[r].length;ecdata[r][i]=(modIndex>=0)?modPoly.get(modIndex):0;}}
+ var totalCodeCount=0;for(var i=0;i<rsBlocks.length;i++){totalCodeCount+=rsBlocks[i].totalCount;}
+ var data=new Array(totalCodeCount);var index=0;for(var i=0;i<maxDcCount;i++){for(var r=0;r<rsBlocks.length;r++){if(i<dcdata[r].length){data[index++]=dcdata[r][i];}}}
+ for(var i=0;i<maxEcCount;i++){for(var r=0;r<rsBlocks.length;r++){if(i<ecdata[r].length){data[index++]=ecdata[r][i];}}}
+ return data;};var QRMode={MODE_NUMBER:1<<0,MODE_ALPHA_NUM:1<<1,MODE_8BIT_BYTE:1<<2,MODE_KANJI:1<<3};var QRErrorCorrectLevel={L:1,M:0,Q:3,H:2};var QRMaskPattern={PATTERN000:0,PATTERN001:1,PATTERN010:2,PATTERN011:3,PATTERN100:4,PATTERN101:5,PATTERN110:6,PATTERN111:7};var QRUtil={PATTERN_POSITION_TABLE:[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],G15:(1<<10)|(1<<8)|(1<<5)|(1<<4)|(1<<2)|(1<<1)|(1<<0),G18:(1<<12)|(1<<11)|(1<<10)|(1<<9)|(1<<8)|(1<<5)|(1<<2)|(1<<0),G15_MASK:(1<<14)|(1<<12)|(1<<10)|(1<<4)|(1<<1),getBCHTypeInfo:function(data){var d=data<<10;while(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G15)>=0){d^=(QRUtil.G15<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G15)));}
+ return((data<<10)|d)^QRUtil.G15_MASK;},getBCHTypeNumber:function(data){var d=data<<12;while(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)>=0){d^=(QRUtil.G18<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)));}
+ return(data<<12)|d;},getBCHDigit:function(data){var digit=0;while(data!=0){digit++;data>>>=1;}
+ return digit;},getPatternPosition:function(typeNumber){return QRUtil.PATTERN_POSITION_TABLE[typeNumber-1];},getMask:function(maskPattern,i,j){switch(maskPattern){case QRMaskPattern.PATTERN000:return(i+j)%2==0;case QRMaskPattern.PATTERN001:return i%2==0;case QRMaskPattern.PATTERN010:return j%3==0;case QRMaskPattern.PATTERN011:return(i+j)%3==0;case QRMaskPattern.PATTERN100:return(Math.floor(i/2)+Math.floor(j/3))%2==0;case QRMaskPattern.PATTERN101:return(i*j)%2+(i*j)%3==0;case QRMaskPattern.PATTERN110:return((i*j)%2+(i*j)%3)%2==0;case QRMaskPattern.PATTERN111:return((i*j)%3+(i+j)%2)%2==0;default:throw new Error("bad maskPattern:"+maskPattern);}},getErrorCorrectPolynomial:function(errorCorrectLength){var a=new QRPolynomial([1],0);for(var i=0;i<errorCorrectLength;i++){a=a.multiply(new QRPolynomial([1,QRMath.gexp(i)],0));}
+ return a;},getLengthInBits:function(mode,type){if(1<=type&&type<10){switch(mode){case QRMode.MODE_NUMBER:return 10;case QRMode.MODE_ALPHA_NUM:return 9;case QRMode.MODE_8BIT_BYTE:return 8;case QRMode.MODE_KANJI:return 8;default:throw new Error("mode:"+mode);}}else if(type<27){switch(mode){case QRMode.MODE_NUMBER:return 12;case QRMode.MODE_ALPHA_NUM:return 11;case QRMode.MODE_8BIT_BYTE:return 16;case QRMode.MODE_KANJI:return 10;default:throw new Error("mode:"+mode);}}else if(type<41){switch(mode){case QRMode.MODE_NUMBER:return 14;case QRMode.MODE_ALPHA_NUM:return 13;case QRMode.MODE_8BIT_BYTE:return 16;case QRMode.MODE_KANJI:return 12;default:throw new Error("mode:"+mode);}}else{throw new Error("type:"+type);}},getLostPoint:function(qrCode){var moduleCount=qrCode.getModuleCount();var lostPoint=0;for(var row=0;row<moduleCount;row++){for(var col=0;col<moduleCount;col++){var sameCount=0;var dark=qrCode.isDark(row,col);for(var r=-1;r<=1;r++){if(row+r<0||moduleCount<=row+r){continue;}
+ for(var c=-1;c<=1;c++){if(col+c<0||moduleCount<=col+c){continue;}
+ if(r==0&&c==0){continue;}
+ if(dark==qrCode.isDark(row+r,col+c)){sameCount++;}}}
+ if(sameCount>5){lostPoint+=(3+sameCount-5);}}}
+ for(var row=0;row<moduleCount-1;row++){for(var col=0;col<moduleCount-1;col++){var count=0;if(qrCode.isDark(row,col))count++;if(qrCode.isDark(row+1,col))count++;if(qrCode.isDark(row,col+1))count++;if(qrCode.isDark(row+1,col+1))count++;if(count==0||count==4){lostPoint+=3;}}}
+ for(var row=0;row<moduleCount;row++){for(var col=0;col<moduleCount-6;col++){if(qrCode.isDark(row,col)&&!qrCode.isDark(row,col+1)&&qrCode.isDark(row,col+2)&&qrCode.isDark(row,col+3)&&qrCode.isDark(row,col+4)&&!qrCode.isDark(row,col+5)&&qrCode.isDark(row,col+6)){lostPoint+=40;}}}
+ for(var col=0;col<moduleCount;col++){for(var row=0;row<moduleCount-6;row++){if(qrCode.isDark(row,col)&&!qrCode.isDark(row+1,col)&&qrCode.isDark(row+2,col)&&qrCode.isDark(row+3,col)&&qrCode.isDark(row+4,col)&&!qrCode.isDark(row+5,col)&&qrCode.isDark(row+6,col)){lostPoint+=40;}}}
+ var darkCount=0;for(var col=0;col<moduleCount;col++){for(var row=0;row<moduleCount;row++){if(qrCode.isDark(row,col)){darkCount++;}}}
+ var ratio=Math.abs(100*darkCount/moduleCount/moduleCount-50)/5;lostPoint+=ratio*10;return lostPoint;}};var QRMath={glog:function(n){if(n<1){throw new Error("glog("+n+")");}
+ return QRMath.LOG_TABLE[n];},gexp:function(n){while(n<0){n+=255;}
+ while(n>=256){n-=255;}
+ return QRMath.EXP_TABLE[n];},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)};for(var i=0;i<8;i++){QRMath.EXP_TABLE[i]=1<<i;}
+ for(var i=8;i<256;i++){QRMath.EXP_TABLE[i]=QRMath.EXP_TABLE[i-4]^QRMath.EXP_TABLE[i-5]^QRMath.EXP_TABLE[i-6]^QRMath.EXP_TABLE[i-8];}
+ for(var i=0;i<255;i++){QRMath.LOG_TABLE[QRMath.EXP_TABLE[i]]=i;}
+ function QRPolynomial(num,shift){if(num.length==undefined){throw new Error(num.length+"/"+shift);}
+ var offset=0;while(offset<num.length&&num[offset]==0){offset++;}
+ this.num=new Array(num.length-offset+shift);for(var i=0;i<num.length-offset;i++){this.num[i]=num[i+offset];}}
+ QRPolynomial.prototype={get:function(index){return this.num[index];},getLength:function(){return this.num.length;},multiply:function(e){var num=new Array(this.getLength()+e.getLength()-1);for(var i=0;i<this.getLength();i++){for(var j=0;j<e.getLength();j++){num[i+j]^=QRMath.gexp(QRMath.glog(this.get(i))+QRMath.glog(e.get(j)));}}
+ return new QRPolynomial(num,0);},mod:function(e){if(this.getLength()-e.getLength()<0){return this;}
+ var ratio=QRMath.glog(this.get(0))-QRMath.glog(e.get(0));var num=new Array(this.getLength());for(var i=0;i<this.getLength();i++){num[i]=this.get(i);}
+ for(var i=0;i<e.getLength();i++){num[i]^=QRMath.gexp(QRMath.glog(e.get(i))+ratio);}
+ return new QRPolynomial(num,0).mod(e);}};function QRRSBlock(totalCount,dataCount){this.totalCount=totalCount;this.dataCount=dataCount;}
+ QRRSBlock.RS_BLOCK_TABLE=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]];QRRSBlock.getRSBlocks=function(typeNumber,errorCorrectLevel){var rsBlock=QRRSBlock.getRsBlockTable(typeNumber,errorCorrectLevel);if(rsBlock==undefined){throw new Error("bad rs block @ typeNumber:"+typeNumber+"/errorCorrectLevel:"+errorCorrectLevel);}
+ var length=rsBlock.length/3;var list=[];for(var i=0;i<length;i++){var count=rsBlock[i*3+0];var totalCount=rsBlock[i*3+1];var dataCount=rsBlock[i*3+2];for(var j=0;j<count;j++){list.push(new QRRSBlock(totalCount,dataCount));}}
+ return list;};QRRSBlock.getRsBlockTable=function(typeNumber,errorCorrectLevel){switch(errorCorrectLevel){case QRErrorCorrectLevel.L:return QRRSBlock.RS_BLOCK_TABLE[(typeNumber-1)*4+0];case QRErrorCorrectLevel.M:return QRRSBlock.RS_BLOCK_TABLE[(typeNumber-1)*4+1];case QRErrorCorrectLevel.Q:return QRRSBlock.RS_BLOCK_TABLE[(typeNumber-1)*4+2];case QRErrorCorrectLevel.H:return QRRSBlock.RS_BLOCK_TABLE[(typeNumber-1)*4+3];default:return undefined;}};function QRBitBuffer(){this.buffer=[];this.length=0;}
+ QRBitBuffer.prototype={get:function(index){var bufIndex=Math.floor(index/8);return((this.buffer[bufIndex]>>>(7-index%8))&1)==1;},put:function(num,length){for(var i=0;i<length;i++){this.putBit(((num>>>(length-i-1))&1)==1);}},getLengthInBits:function(){return this.length;},putBit:function(bit){var bufIndex=Math.floor(this.length/8);if(this.buffer.length<=bufIndex){this.buffer.push(0);}
+ if(bit){this.buffer[bufIndex]|=(0x80>>>(this.length%8));}
+ this.length++;}};var QRCodeLimitLength=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]];
+
+ function _isSupportCanvas() {
+ return typeof CanvasRenderingContext2D != "undefined";
+ }
+
+ // android 2.x doesn't support Data-URI spec
+ function _getAndroid() {
+ var android = false;
+ var sAgent = navigator.userAgent;
+
+ if (/android/i.test(sAgent)) { // android
+ android = true;
+ var aMat = sAgent.toString().match(/android ([0-9]\.[0-9])/i);
+
+ if (aMat && aMat[1]) {
+ android = parseFloat(aMat[1]);
+ }
+ }
+
+ return android;
+ }
+
+ var svgDrawer = (function() {
+
+ var Drawing = function (el, htOption) {
+ this._el = el;
+ this._htOption = htOption;
+ };
+
+ Drawing.prototype.draw = function (oQRCode) {
+ var _htOption = this._htOption;
+ var _el = this._el;
+ var nCount = oQRCode.getModuleCount();
+ var nWidth = Math.floor(_htOption.width / nCount);
+ var nHeight = Math.floor(_htOption.height / nCount);
+
+ this.clear();
+
+ function makeSVG(tag, attrs) {
+ var el = document.createElementNS('http://www.w3.org/2000/svg', tag);
+ for (var k in attrs)
+ if (attrs.hasOwnProperty(k)) el.setAttribute(k, attrs[k]);
+ return el;
+ }
+
+ var svg = makeSVG("svg" , {'viewBox': '0 0 ' + String(nCount) + " " + String(nCount), 'width': '100%', 'height': '100%', 'fill': _htOption.colorLight});
+ svg.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:xlink", "http://www.w3.org/1999/xlink");
+ _el.appendChild(svg);
+
+ svg.appendChild(makeSVG("rect", {"fill": _htOption.colorLight, "width": "100%", "height": "100%"}));
+ svg.appendChild(makeSVG("rect", {"fill": _htOption.colorDark, "width": "1", "height": "1", "id": "template"}));
+
+ for (var row = 0; row < nCount; row++) {
+ for (var col = 0; col < nCount; col++) {
+ if (oQRCode.isDark(row, col)) {
+ var child = makeSVG("use", {"x": String(col), "y": String(row)});
+ child.setAttributeNS("http://www.w3.org/1999/xlink", "href", "#template")
+ svg.appendChild(child);
+ }
+ }
+ }
+ };
+ Drawing.prototype.clear = function () {
+ while (this._el.hasChildNodes())
+ this._el.removeChild(this._el.lastChild);
+ };
+ return Drawing;
+ })();
+
+ var useSVG = document.documentElement.tagName.toLowerCase() === "svg";
+
+ // Drawing in DOM by using Table tag
+ var Drawing = useSVG ? svgDrawer : !_isSupportCanvas() ? (function () {
+ var Drawing = function (el, htOption) {
+ this._el = el;
+ this._htOption = htOption;
+ };
+
+ /**
+ * Draw the QRCode
+ *
+ * @param {QRCode} oQRCode
+ */
+ Drawing.prototype.draw = function (oQRCode) {
+ var _htOption = this._htOption;
+ var _el = this._el;
+ var nCount = oQRCode.getModuleCount();
+ var nWidth = Math.floor(_htOption.width / nCount);
+ var nHeight = Math.floor(_htOption.height / nCount);
+ var aHTML = ['<table style="border:0;border-collapse:collapse;">'];
+
+ for (var row = 0; row < nCount; row++) {
+ aHTML.push('<tr>');
+
+ for (var col = 0; col < nCount; col++) {
+ aHTML.push('<td style="border:0;border-collapse:collapse;padding:0;margin:0;width:' + nWidth + 'px;height:' + nHeight + 'px;background-color:' + (oQRCode.isDark(row, col) ? _htOption.colorDark : _htOption.colorLight) + ';"></td>');
+ }
+
+ aHTML.push('</tr>');
+ }
+
+ aHTML.push('</table>');
+ _el.innerHTML = aHTML.join('');
+
+ // Fix the margin values as real size.
+ var elTable = _el.childNodes[0];
+ var nLeftMarginTable = (_htOption.width - elTable.offsetWidth) / 2;
+ var nTopMarginTable = (_htOption.height - elTable.offsetHeight) / 2;
+
+ if (nLeftMarginTable > 0 && nTopMarginTable > 0) {
+ elTable.style.margin = nTopMarginTable + "px " + nLeftMarginTable + "px";
+ }
+ };
+
+ /**
+ * Clear the QRCode
+ */
+ Drawing.prototype.clear = function () {
+ this._el.innerHTML = '';
+ };
+
+ return Drawing;
+ })() : (function () { // Drawing in Canvas
+ function _onMakeImage() {
+ this._elImage.src = this._elCanvas.toDataURL("image/png");
+ this._elImage.style.display = "block";
+ this._elCanvas.style.display = "none";
+ }
+
+ // Android 2.1 bug workaround
+ // http://code.google.com/p/android/issues/detail?id=5141
+ if (this._android && this._android <= 2.1) {
+ var factor = 1 / window.devicePixelRatio;
+ var drawImage = CanvasRenderingContext2D.prototype.drawImage;
+ CanvasRenderingContext2D.prototype.drawImage = function (image, sx, sy, sw, sh, dx, dy, dw, dh) {
+ if (("nodeName" in image) && /img/i.test(image.nodeName)) {
+ for (var i = arguments.length - 1; i >= 1; i--) {
+ arguments[i] = arguments[i] * factor;
+ }
+ } else if (typeof dw == "undefined") {
+ arguments[1] *= factor;
+ arguments[2] *= factor;
+ arguments[3] *= factor;
+ arguments[4] *= factor;
+ }
+
+ drawImage.apply(this, arguments);
+ };
+ }
+
+ /**
+ * Check whether the user's browser supports Data URI or not
+ *
+ * @private
+ * @param {Function} fSuccess Occurs if it supports Data URI
+ * @param {Function} fFail Occurs if it doesn't support Data URI
+ */
+ function _safeSetDataURI(fSuccess, fFail) {
+ var self = this;
+ self._fFail = fFail;
+ self._fSuccess = fSuccess;
+
+ // Check it just once
+ if (self._bSupportDataURI === null) {
+ var el = document.createElement("img");
+ var fOnError = function() {
+ self._bSupportDataURI = false;
+
+ if (self._fFail) {
+ self._fFail.call(self);
+ }
+ };
+ var fOnSuccess = function() {
+ self._bSupportDataURI = true;
+
+ if (self._fSuccess) {
+ self._fSuccess.call(self);
+ }
+ };
+
+ el.onabort = fOnError;
+ el.onerror = fOnError;
+ el.onload = fOnSuccess;
+ el.src = "data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg=="; // the Image contains 1px data.
+ return;
+ } else if (self._bSupportDataURI === true && self._fSuccess) {
+ self._fSuccess.call(self);
+ } else if (self._bSupportDataURI === false && self._fFail) {
+ self._fFail.call(self);
+ }
+ };
+
+ /**
+ * Drawing QRCode by using canvas
+ *
+ * @constructor
+ * @param {HTMLElement} el
+ * @param {Object} htOption QRCode Options
+ */
+ var Drawing = function (el, htOption) {
+ this._bIsPainted = false;
+ this._android = _getAndroid();
+
+ this._htOption = htOption;
+ this._elCanvas = document.createElement("canvas");
+ this._elCanvas.width = htOption.width;
+ this._elCanvas.height = htOption.height;
+ el.appendChild(this._elCanvas);
+ this._el = el;
+ this._oContext = this._elCanvas.getContext("2d");
+ this._bIsPainted = false;
+ this._elImage = document.createElement("img");
+ this._elImage.alt = "Scan me!";
+ this._elImage.style.display = "none";
+ this._el.appendChild(this._elImage);
+ this._bSupportDataURI = null;
+ };
+
+ /**
+ * Draw the QRCode
+ *
+ * @param {QRCode} oQRCode
+ */
+ Drawing.prototype.draw = function (oQRCode) {
+ var _elImage = this._elImage;
+ var _oContext = this._oContext;
+ var _htOption = this._htOption;
+
+ var nCount = oQRCode.getModuleCount();
+ var nWidth = _htOption.width / nCount;
+ var nHeight = _htOption.height / nCount;
+ var nRoundedWidth = Math.round(nWidth);
+ var nRoundedHeight = Math.round(nHeight);
+
+ _elImage.style.display = "none";
+ this.clear();
+
+ for (var row = 0; row < nCount; row++) {
+ for (var col = 0; col < nCount; col++) {
+ var bIsDark = oQRCode.isDark(row, col);
+ var nLeft = col * nWidth;
+ var nTop = row * nHeight;
+ _oContext.strokeStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight;
+ _oContext.lineWidth = 1;
+ _oContext.fillStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight;
+ _oContext.fillRect(nLeft, nTop, nWidth, nHeight);
+
+ // 안티 앨리어싱 방지 처리
+ _oContext.strokeRect(
+ Math.floor(nLeft) + 0.5,
+ Math.floor(nTop) + 0.5,
+ nRoundedWidth,
+ nRoundedHeight
+ );
+
+ _oContext.strokeRect(
+ Math.ceil(nLeft) - 0.5,
+ Math.ceil(nTop) - 0.5,
+ nRoundedWidth,
+ nRoundedHeight
+ );
+ }
+ }
+
+ this._bIsPainted = true;
+ };
+
+ /**
+ * Make the image from Canvas if the browser supports Data URI.
+ */
+ Drawing.prototype.makeImage = function () {
+ if (this._bIsPainted) {
+ _safeSetDataURI.call(this, _onMakeImage);
+ }
+ };
+
+ /**
+ * Return whether the QRCode is painted or not
+ *
+ * @return {Boolean}
+ */
+ Drawing.prototype.isPainted = function () {
+ return this._bIsPainted;
+ };
+
+ /**
+ * Clear the QRCode
+ */
+ Drawing.prototype.clear = function () {
+ this._oContext.clearRect(0, 0, this._elCanvas.width, this._elCanvas.height);
+ this._bIsPainted = false;
+ };
+
+ /**
+ * @private
+ * @param {Number} nNumber
+ */
+ Drawing.prototype.round = function (nNumber) {
+ if (!nNumber) {
+ return nNumber;
+ }
+
+ return Math.floor(nNumber * 1000) / 1000;
+ };
+
+ return Drawing;
+ })();
+
+ /**
+ * Get the type by string length
+ *
+ * @private
+ * @param {String} sText
+ * @param {Number} nCorrectLevel
+ * @return {Number} type
+ */
+ function _getTypeNumber(sText, nCorrectLevel) {
+ var nType = 1;
+ var length = _getUTF8Length(sText);
+
+ for (var i = 0, len = QRCodeLimitLength.length; i <= len; i++) {
+ var nLimit = 0;
+
+ switch (nCorrectLevel) {
+ case QRErrorCorrectLevel.L :
+ nLimit = QRCodeLimitLength[i][0];
+ break;
+ case QRErrorCorrectLevel.M :
+ nLimit = QRCodeLimitLength[i][1];
+ break;
+ case QRErrorCorrectLevel.Q :
+ nLimit = QRCodeLimitLength[i][2];
+ break;
+ case QRErrorCorrectLevel.H :
+ nLimit = QRCodeLimitLength[i][3];
+ break;
+ }
+
+ if (length <= nLimit) {
+ break;
+ } else {
+ nType++;
+ }
+ }
+
+ if (nType > QRCodeLimitLength.length) {
+ throw new Error("Too long data");
+ }
+
+ return nType;
+ }
+
+ function _getUTF8Length(sText) {
+ var replacedText = encodeURI(sText).toString().replace(/\%[0-9a-fA-F]{2}/g, 'a');
+ return replacedText.length + (replacedText.length != sText ? 3 : 0);
+ }
+
+ /**
+ * @class QRCode
+ * @constructor
+ * @example
+ * new QRCode(document.getElementById("test"), "http://jindo.dev.naver.com/collie");
+ *
+ * @example
+ * var oQRCode = new QRCode("test", {
+ * text : "http://naver.com",
+ * width : 128,
+ * height : 128
+ * });
+ *
+ * oQRCode.clear(); // Clear the QRCode.
+ * oQRCode.makeCode("http://map.naver.com"); // Re-create the QRCode.
+ *
+ * @param {HTMLElement|String} el target element or 'id' attribute of element.
+ * @param {Object|String} vOption
+ * @param {String} vOption.text QRCode link data
+ * @param {Number} [vOption.width=256]
+ * @param {Number} [vOption.height=256]
+ * @param {String} [vOption.colorDark="#000000"]
+ * @param {String} [vOption.colorLight="#ffffff"]
+ * @param {QRCode.CorrectLevel} [vOption.correctLevel=QRCode.CorrectLevel.H] [L|M|Q|H]
+ */
+ QRCode = function (el, vOption) {
+ this._htOption = {
+ width : 256,
+ height : 256,
+ typeNumber : 4,
+ colorDark : "#000000",
+ colorLight : "#ffffff",
+ correctLevel : QRErrorCorrectLevel.H
+ };
+
+ if (typeof vOption === 'string') {
+ vOption = {
+ text : vOption
+ };
+ }
+
+ // Overwrites options
+ if (vOption) {
+ for (var i in vOption) {
+ this._htOption[i] = vOption[i];
+ }
+ }
+
+ if (typeof el == "string") {
+ el = document.getElementById(el);
+ }
+
+ if (this._htOption.useSVG) {
+ Drawing = svgDrawer;
+ }
+
+ this._android = _getAndroid();
+ this._el = el;
+ this._oQRCode = null;
+ this._oDrawing = new Drawing(this._el, this._htOption);
+
+ if (this._htOption.text) {
+ this.makeCode(this._htOption.text);
+ }
+ };
+
+ /**
+ * Make the QRCode
+ *
+ * @param {String} sText link data
+ */
+ QRCode.prototype.makeCode = function (sText) {
+ this._oQRCode = new QRCodeModel(_getTypeNumber(sText, this._htOption.correctLevel), this._htOption.correctLevel);
+ this._oQRCode.addData(sText);
+ this._oQRCode.make();
+ this._el.title = sText;
+ this._oDrawing.draw(this._oQRCode);
+ this.makeImage();
+ };
+
+ /**
+ * Make the Image from Canvas element
+ * - It occurs automatically
+ * - Android below 3 doesn't support Data-URI spec.
+ *
+ * @private
+ */
+ QRCode.prototype.makeImage = function () {
+ if (typeof this._oDrawing.makeImage == "function" && (!this._android || this._android >= 3)) {
+ this._oDrawing.makeImage();
+ }
+ };
+
+ /**
+ * Clear the QRCode
+ */
+ QRCode.prototype.clear = function () {
+ this._oDrawing.clear();
+ };
+
+ /**
+ * @name QRCode.CorrectLevel
+ */
+ QRCode.CorrectLevel = QRErrorCorrectLevel;
+})();
diff --git a/zq-erp/src/main/resources/static/js/systools/MBase.js b/zq-erp/src/main/resources/static/js/systools/MBase.js
index d754c18..648d3ef 100644
--- a/zq-erp/src/main/resources/static/js/systools/MBase.js
+++ b/zq-erp/src/main/resources/static/js/systools/MBase.js
@@ -5,9 +5,16 @@
*/
function getRootPath() {
var curWwwPath = window.document.location.href;
- console.log(curWwwPath);
+ let url="";
var pathName = window.document.location.pathname;
- var url=curWwwPath.substring(0, curWwwPath.indexOf(pathName));
+ if(pathName&&pathName!="/"){
+ url= curWwwPath.substring(0, curWwwPath.indexOf(pathName));
+ }else{
+ url= curWwwPath;
+ }
+ console.log(url);
+ return url;
+
// if(url.indexOf('localhost')>0){
// return url++- pathName.substring(0, pathName.substr(1).indexOf('/') + 1);
// console.log("1"+url);
@@ -16,7 +23,7 @@
// return url+ pathName.substring(0, pathName.substr(1).indexOf('/') + 1);
// console.log("2"+url);
// }
- return url;
+
}
/** 全局路径，代表当前网站的根URL */
var basePath = getRootPath();
diff --git a/zq-erp/src/main/resources/templates/views/common/login.html b/zq-erp/src/main/resources/templates/views/common/login.html
index f8bf84f..1d532e2 100644
--- a/zq-erp/src/main/resources/templates/views/common/login.html
+++ b/zq-erp/src/main/resources/templates/views/common/login.html
@@ -24,6 +24,7 @@
background: #fff;
height: 450px;
}
+
.download-bar {
margin-top: 15px;
color: #4968bd;
@@ -40,6 +41,8 @@
}
</style>
<script>
+
+
var isoldIE = false;
if (navigator.userAgent.indexOf("MSIE") > 0) {
if (navigator.userAgent.indexOf("MSIE 6.0") > 0
@@ -67,7 +70,8 @@
display: block;
padding: 20px 12px;
width: 100%;
- font-size: 14px -webkit-box-shadow: none !important;
+ font-size: 14px
+ -webkit-box-shadow: none !important;
box-shadow: none !important;
border-radius: 0px !important;
}
@@ -114,6 +118,78 @@
height: 200px;
}
}
+
+ .qrloginBox {
+ float: right;
+ }
+
+ .qrloginSpan {
+ background: #edf4ff;
+ border: 1px solid #155bd4;
+ position: relative;
+ padding: 4px 8px;
+ border-radius: 2px;
+ font-size: 14px;
+ color: #155bd4;
+ cursor: pointer;
+ }
+
+ .qrImg {
+ width: 50px;
+ cursor: pointer;
+ }
+
+ #qrCodeIcon {
+ margin: 20px auto;
+ text-align: center;
+ overflow: hidden;
+ width: 220px;
+ height: 220px;
+ border: 1px solid #dcd0d0;
+ }
+
+ #qrCodeIcon img {
+ margin: 10px;
+ }
+ #scanResult{
+ text-align: center;
+ color: #333333;
+ }
+ #scanResult{
+ text-align: center;
+ }
+ #scanResult img{
+ width: 50px;
+ margin: 50px auto;
+ }
+ #wxQrcode{
+ text-align: center;
+ color: #333333;
+ width: 220px;
+ height: 220px;
+ overflow: hidden;
+ position: relative;
+ margin: 20px auto;
+ }
+ .wxQrcodeInfo{
+ position: absolute;
+ top: 0px;
+ background: rgb(255 255 255 / 94%);
+ width: 220px;
+ height: 220px;
+ display: flex;
+ z-index: 999999;
+ justify-content: center;
+ align-items: center;
+ flex-direction: column;
+ }
+ .wxQrcodeImg{
+ position: absolute;
+ width: 200px;
+ top: 10px;
+ z-index: 11;
+ left: 10px;
+ }
</style>
</head>
@@ -122,28 +198,64 @@
<div class="signinpanel">
<div class="row" style="box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);">
<div class="col-sm-6"></div>
- <div class="col-sm-6">
- <form method="post" class="dataForm">
- <h3 class="no-margins text-center title" style="color: #666666;font-size: 24px;font-weight: bold">欢迎登录</h3>
- <div>
- <input autocomplete="off" id="account" type="text" placeholder="请输入用户名"
- class="form-control uname"/>
- <img alt="" src="../../images/user.png">
- </div>
- <br>
- <div>
- <input autocomplete="off" id="password"
- type="password" class="form-control pword m-b" nullmsg="密码不能为空"
- placeholder="请输入密码"/>
- <img alt="" src="../../images/locked.png">
- </div>
- <br> <br>
+ <div class="col-sm-6 " style="padding: 0px;">
+ <div id="accountWarp">
+ <div onclick="changeLoginType()" class="qrloginBox"><span class="qrloginSpan">扫码登录</span><img
+ class="qrImg"
+ src="../../images/qrcode.png"></div>
+ <form method="post" class="dataForm">
+ <h3 class="no-margins text-center title" style="color: #666666;font-size: 24px;font-weight: bold">
+ 密码登录</h3>
+ <div>
+ <input autocomplete="off" id="account" type="text" placeholder="请输入用户名"
+ class="form-control uname"/>
+ <img alt="" src="../../images/user.png">
+ </div>
+ <br>
+ <div>
+ <input autocomplete="off" id="password"
+ type="password" class="form-control pword m-b" nullmsg="密码不能为空"
+ placeholder="请输入密码"/>
+ <img alt="" src="../../images/locked.png">
+ </div>
+ <br> <br>
- <button type="button" onclick="login()" style="background-color: #4f6cff;border: none;font-size: 18px;"
- class="btn btn-success btn-block">登录
- </button>
+ <button type="button" onclick="login()"
+ style="background-color: #4f6cff;border: none;font-size: 18px;"
+ class="btn btn-success btn-block">登录
+ </button>
- </form>
+ </form>
+ </div>
+ <div id="qrCodeWarp">
+ <div onclick="changeLoginType()" class="qrloginBox"><span class="qrloginSpan">密码登录</span><img
+ class="qrImg"
+ src="../../images/pc.png"></div>
+ <div style="border-radius: 3px;
+ padding: 30px;">
+ <h3 class="no-margins text-center title" style="color: #666666;font-size: 24px;font-weight: bold">
+ 扫码登录</h3>
+ <div id="qrCodeIcon">
+
+ </div>
+ <div id="wxQrcode">
+
+ <img class="wxQrcodeImg" src=" ../../images/qrcodeBack.png">
+ <div class="wxQrcodeInfo">
+ <p>二维码已失效</p>
+ <button onclick="flushQrcode()" class="btn btn-primary">刷新二维码</button>
+ </div>
+
+
+ </div>
+ <div id="scanResult" style="display: none">
+
+ <img src="../../images/dui.png">
+ <p>扫描成功！</p>
+ <p>请在手机上根据提示确认登录</p>
+ </div>
+ </div>
+ </div>
</div>
</div>
@@ -167,9 +279,47 @@
</body>
<script type="text/javascript" th:src="@{/js/systools/MJsBase.js}"></script>
<script type="text/javascript" th:src="@{/js/plugin/jsencrypt.min.js}"></script>
+<script type="text/javascript" th:src="@{/js/plugin/qrcode.js}"></script>
<script th:inline="javascript">
var crypt = new JSEncrypt();
+ let loginType = 1;
+ $("#qrCodeWarp").hide();
+ $("#wxQrcode").hide();
+ function changeLoginType() {
+ if (loginType == 1) {
+ $("#accountWarp").hide();
+ $("#qrCodeWarp").show();
+ loginType = 2;
+ } else {
+ $("#accountWarp").show();
+ $("#qrCodeWarp").hide();
+ loginType = 1;
+ }
+ }
+
+ //soket用户标识
+ let webClientId = "webClientId_" + MTools.randomStr();
+ let loginQrCodeKey="";
+
+
+ markQrcode();
+ function markQrcode(){
+
+ var qrcode = new QRCode(document.getElementById("qrCodeIcon"), {
+ width: 200,
+ height: 200
+ });
+ loginQrCodeKey="loginQrCodeKey_" + MTools.randomStr();
+ let qrInfo={webClientId:webClientId,loginQrCodeKey:loginQrCodeKey}
+ console.log(qrInfo);
+ qrcode.makeCode(JSON.stringify(qrInfo));
+ $('#qrCodeIcon canvas').show();
+
+ }
+
+
+ openSocket();
/*<![CDATA[*/
var publicKey =/*[[${session.publicKey}]]*/
@@ -178,7 +328,25 @@
crypt.setKey(publicKey);
+
+ function flushQrcode(){
+
+ $("#scanResult").hide();
+ $("#wxQrcode").hide();
+ webClientId = "XCMY_SCAN_QRCODE" + MTools.randomStr();
+
+ $("#qrCodeIcon").html("");
+ $("#qrCodeIcon").show();
+ markQrcode();
+
+
+
+
+ }
+
+
function login() {
+
if ($("#account").val() == "") {
layer.tips('请输入账号！', '#account');
return false;
@@ -191,12 +359,16 @@
$.AjaxProxy({
p: {
suAccount: encAcc,
- suPassword: encPwd
+ suPassword: encPwd,
+ loginType: 1
}
}).invoke("/common/dologin", function (loj) {
MTools.redirect("/" + loj.getValue("page"));
});
}
+
+
+
function dologin(e) {
if (e.keyCode == 13) {
@@ -206,5 +378,87 @@
return false;
}
}
+
+
+
+ var socket;
+ function openSocket() {
+ if(typeof(WebSocket) == "undefined") {
+ console.log("您的浏览器不支持WebSocket");
+ }else{
+ console.log("您的浏览器支持WebSocket");
+ //实现化WebSocket对象，指定要连接的服务器地址与端口 建立连接
+ let wsPath= getRootPath();
+ var socketUrl= wsPath.replace("http","ws")+ "/webSocketServer?userId="+webClientId;
+ console.log(socketUrl);
+ if(socket!=null){
+ socket.close();
+ socket=null;
+ }
+ socket = new WebSocket(socketUrl);
+ //打开事件
+ socket.onopen = function() {
+ console.log("websocket已打开");
+ sendMessage();
+ };
+ //获得消息事件
+ socket.onmessage = function(msg) {
+ console.log(msg);
+ var serverMsg = JSON.parse(msg.data);
+
+ if(serverMsg.msgType==1){
+
+ $("#scanResult").show();
+ $("#qrCodeIcon").hide();
+
+ }else if(serverMsg.msgType==2){
+
+ if(serverMsg.loginOperation==1){
+ $.AjaxProxy({
+ p: {
+ loginQrCodeKey: loginQrCodeKey,
+ loginType: 2
+ }
+ }).invoke("/common/dologin", function (loj) {
+ MTools.redirect("/" + loj.getValue("page"));
+ });
+ }else if(serverMsg.loginOperation==2){
+ layer.msg("取消登录", {
+ icon : 2
+ });
+ $("#scanResult").hide();
+ $("#wxQrcode").show();
+ }
+ }
+ };
+ //关闭事件
+ socket.onclose = function() {
+ console.log("websocket已关闭");
+ };
+ //发生了错误事件
+ socket.onerror = function() {
+ console.log("websocket发生了错误");
+ }
+ }
+ }
+
+ function sendMessage() {
+ if(typeof(WebSocket) == "undefined") {
+ console.log("您的浏览器不支持WebSocket");
+ }else {
+ var msg = '{ }';
+ socket.send(msg);
+ }
+ }
+ function colseSocket() {
+ if(typeof(WebSocket) == "undefined") {
+ console.log("您的浏览器不支持WebSocket");
+ }else {
+ socket.close();
+ }
+ }
+
+
+
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1