diff --git a/20221020教师出入校审批系统-v2(1).docx b/20221020教师出入校审批系统-v2(1).docx new file mode 100644 index 0000000..0575840 Binary files /dev/null and b/20221020教师出入校审批系统-v2(1).docx differ diff --git a/IOReportSysBE/WW_verify_EdOZDpJGkCM11pc2.txt b/IOReportSysBE/WW_verify_EdOZDpJGkCM11pc2.txt new file mode 100644 index 0000000..3617e78 --- /dev/null +++ b/IOReportSysBE/WW_verify_EdOZDpJGkCM11pc2.txt @@ -0,0 +1 @@ +EdOZDpJGkCM11pc2 \ No newline at end of file diff --git a/IOReportSysBE/src/main/java/edu/ncst/ioreport/config/SecurityConfig.java b/IOReportSysBE/src/main/java/edu/ncst/ioreport/config/SecurityConfig.java index 207674b..949e44d 100644 --- a/IOReportSysBE/src/main/java/edu/ncst/ioreport/config/SecurityConfig.java +++ b/IOReportSysBE/src/main/java/edu/ncst/ioreport/config/SecurityConfig.java @@ -90,6 +90,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { "/api/image/get/**", "/*.html", "/**/*.html", + "/**/*.txt", "/**/*.css", "/**/*.js", "/error*", diff --git a/IOReportSysBE/src/main/java/edu/ncst/ioreport/config/security/provider/WechatIdLoginProvider.java b/IOReportSysBE/src/main/java/edu/ncst/ioreport/config/security/provider/WechatIdLoginProvider.java index d531b3c..94c4556 100644 --- a/IOReportSysBE/src/main/java/edu/ncst/ioreport/config/security/provider/WechatIdLoginProvider.java +++ b/IOReportSysBE/src/main/java/edu/ncst/ioreport/config/security/provider/WechatIdLoginProvider.java @@ -9,6 +9,7 @@ import edu.ncst.ioreport.vo.SessionKey; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; @@ -22,6 +23,9 @@ public class WechatIdLoginProvider implements AuthenticationProvider { @Autowired private IUserService userService; + @Autowired + private RedisTemplate stringRedisTemplate; + @SneakyThrows @Override public Authentication authenticate(Authentication authentication) throws AuthenticationException { @@ -34,7 +38,7 @@ public class WechatIdLoginProvider implements AuthenticationProvider { WechatIdAuthenticationToken token = (WechatIdAuthenticationToken) authentication; String code = token.getWechatCode(); - SessionKey sessionKeyDTO = WeChatUtils.code2session(code); + SessionKey sessionKeyDTO = WeChatUtils.code2session(code,stringRedisTemplate); if (sessionKeyDTO == null) { return null; diff --git a/IOReportSysBE/src/main/java/edu/ncst/ioreport/controller/UserController.java b/IOReportSysBE/src/main/java/edu/ncst/ioreport/controller/UserController.java index 9853442..4c59a9e 100644 --- a/IOReportSysBE/src/main/java/edu/ncst/ioreport/controller/UserController.java +++ b/IOReportSysBE/src/main/java/edu/ncst/ioreport/controller/UserController.java @@ -44,7 +44,7 @@ public class UserController { @ApiOperation("获取用户列表") @PostMapping("/login") - public ResultVO loginByWechat(HttpServletRequest request , @RequestParam String weChatCode,UserLoginVO paramUserLoginVO) { + public ResultVO loginByWechat(HttpServletRequest request , @RequestParam(required = false) String weChatCode,UserLoginVO paramUserLoginVO) { try { if(paramUserLoginVO==null){ paramUserLoginVO = new ObjectMapper().readValue(request.getInputStream(), UserLoginVO.class); @@ -59,19 +59,15 @@ public class UserController { if(StringUtil.isNullOrEmpty(weChatCode)){ throw new BusinessException(CodeMsg.PARAM_ERROR.fillArgs("登录信息不全")); } - String wechatId = stringRedisTemplate.opsForValue().get("WECHATID#"+weChatCode); - if(StringUtil.isNullOrEmpty(wechatId)){ - SessionKey sessionKeyDTO = WeChatUtils.code2session(weChatCode); - if (sessionKeyDTO == null) { - throw new BusinessException(CodeMsg.LOGIN_FAIL); - } - wechatId = sessionKeyDTO.getWeChatId(); - stringRedisTemplate.opsForValue().set("WECHATID#"+weChatCode,wechatId,2, TimeUnit.DAYS); + SessionKey sessionKeyDTO = WeChatUtils.code2session(weChatCode,stringRedisTemplate); + if (sessionKeyDTO == null) { + throw new BusinessException(CodeMsg.LOGIN_FAIL); } - return ResultUtils.success("ok",wechatId); + return ResultUtils.success("ok",sessionKeyDTO); } } + // // @ApiOperation("获取用户列表") // @GetMapping("/list") diff --git a/IOReportSysBE/src/main/java/edu/ncst/ioreport/utils/WeChatUtils.java b/IOReportSysBE/src/main/java/edu/ncst/ioreport/utils/WeChatUtils.java index 9defb16..b3e5687 100644 --- a/IOReportSysBE/src/main/java/edu/ncst/ioreport/utils/WeChatUtils.java +++ b/IOReportSysBE/src/main/java/edu/ncst/ioreport/utils/WeChatUtils.java @@ -1,49 +1,64 @@ package edu.ncst.ioreport.utils; +import com.alibaba.fastjson.JSON; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import edu.ncst.ioreport.exception.BusinessException; import edu.ncst.ioreport.vo.AccessToken; import edu.ncst.ioreport.vo.SessionKey; +import io.netty.util.internal.StringUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; import org.springframework.web.client.RestTemplate; +import java.util.concurrent.TimeUnit; + @Component public class WeChatUtils { private static final RestTemplate restTemplate; + //测试企业 private static final String corpId = "ww17f8d10783494584"; private static final String corpsecret = "i5t-rh8bXeNCgihcYPrG9ZPpWkivzPJ69sv570osk6I"; -// private static final String corpId = "wwcb1e222a0708b4fc"; -// private static final String corpsecret = "uWh34kbYvxR7txvICe97mrGIuooLRfhsWi5YBPWLuAg"; + + //教务处真实数据 +// private static final String corpId = "wx61dd7aa1b722739c"; +// private static final String corpsecret = "nxThL1GQnA2aXLCf2MEk3VZ4fPZ95uEYfqcnH--dWrA"; // static { restTemplate = new RestTemplate(); } // 根据 Code 获取 Session - public static SessionKey code2session(String code) { - // 获取 accesstoken - String gettoken = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid=" + corpId + "&corpsecret=" + corpsecret + "&js_code=" + - code + "&grant_type=authorization_code"; + public static SessionKey code2session(String code,RedisTemplate stringRedisTemplate) { //获取Sessionid和userid - String jscode2session = "https://qyapi.weixin.qq.com/cgi-bin/miniprogram/jscode2session?access_token=%s&js_code=%s&grant_type=authorization_code"; - - ResponseEntity response = restTemplate.getForEntity(gettoken, String.class); - ObjectMapper objectMapper = new ObjectMapper(); - SessionKey session = null; - + SessionKey session=new SessionKey(); try { - AccessToken accessToken = objectMapper.readValue(response.getBody(), AccessToken.class); - response = restTemplate.getForEntity(String.format(jscode2session, accessToken.getAccessToken(), code), String.class); - session = objectMapper.readValue(response.getBody(), SessionKey.class); + String tokenStr = stringRedisTemplate.opsForValue().get("ACCESSTOKEN"); + AccessToken token=null; + ObjectMapper objectMapper = new ObjectMapper(); + ResponseEntity response; + if(!StringUtil.isNullOrEmpty(tokenStr)){ + token = JSON.parseObject(tokenStr,AccessToken.class); + } + if(token == null){ + // 获取 accesstoken + String gettoken = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid=" + corpId + "&corpsecret=" + corpsecret; + response = restTemplate.getForEntity(gettoken, String.class); + token = objectMapper.readValue(response.getBody(), AccessToken.class); + stringRedisTemplate.opsForValue().set("ACCESSTOKEN", JSON.toJSONString(token),118, TimeUnit.MINUTES); + }else{ + String jscode2session = "https://qyapi.weixin.qq.com/cgi-bin/miniprogram/jscode2session?access_token=%s&js_code=%s&grant_type=authorization_code"; + response = restTemplate.getForEntity(String.format(jscode2session, token.getAccessToken(), code), String.class); + session = objectMapper.readValue(response.getBody(), SessionKey.class); + } } catch (JsonProcessingException e) { - e.printStackTrace(); + throw new BusinessException("登录失败"+e); } - return session; } - } diff --git a/IOReportSysBE/src/main/resources/application.yml b/IOReportSysBE/src/main/resources/application.yml index 3323bdf..6e9b954 100644 --- a/IOReportSysBE/src/main/resources/application.yml +++ b/IOReportSysBE/src/main/resources/application.yml @@ -7,12 +7,12 @@ spring: password: hikari: max-lifetime: 300000 - # redis password: redis221024 #redis 服务器连接密码 默认为空 + # redis password: redis221024 hbljjg@2020 #redis 服务器连接密码 默认为空 redis: database: 0 #redis 数据库索引（默认为0） host: 127.0.0.1 #redis 服务器地址 port: 6379 #redis 服务器连接端口号 - password: hbljjg@2020 #redis 服务器连接密码 默认为空 + password: redis221024 #redis 服务器连接密码 默认为空 lettuce: pool: max-active: 8 # 连接池最大连接数(使用负值表示没有限制） 默认8 diff --git a/IOReportSysMP/miniprogram/api/userApi/userApi.ts b/IOReportSysMP/miniprogram/api/userApi/userApi.ts index 1511eb1..c88463e 100644 --- a/IOReportSysMP/miniprogram/api/userApi/userApi.ts +++ b/IOReportSysMP/miniprogram/api/userApi/userApi.ts @@ -14,8 +14,9 @@ const getCurrentUser = async (wechatID:string)=>{ params.token = token params.parameters="" params = JSON.stringify(params) - // console.log(params) + console.log(params) let res =await request({url: BASE_URL + 'api/users/FunctionCall/', method: 'POST',data:params }) + console.log(res) return res } diff --git a/IOReportSysMP/miniprogram/app.ts b/IOReportSysMP/miniprogram/app.ts index 4c67573..8de890a 100644 --- a/IOReportSysMP/miniprogram/app.ts +++ b/IOReportSysMP/miniprogram/app.ts @@ -39,15 +39,25 @@ App({ data: {weChatCode:code}, success: (res: any) => { if(res&&res.data&&res.data.data){ - wx.showToast({ - title: '登录成功', - icon: 'success' - }); - wx.setStorageSync(constant.WECHATID, res.data.data); - this.globalData.wechatID = res.data.data - if (this.userInfoReadyCallback){ - this.userInfoReadyCallback(res.data.data); - } + let sessionKey = res.data.data; + if(!sessionKey.weChatId){ + wx.showModal({ + title:"登录失败", + content:"请联系管理员："+sessionKey.errmsg, + showCancel:false + }) + }else{ + wx.showToast({ + title: '登录成功', + icon: 'success' + }); + wx.setStorageSync(constant.WECHATID, sessionKey.weChatId); + this.globalData.wechatID = sessionKey.weChatId + if (this.userInfoReadyCallback){ + this.userInfoReadyCallback(sessionKey.weChatId); + } + } + }else{ wx.showToast({ title: '登录失败: '+res.msg, diff --git a/IOReportSysMP/miniprogram/pages/health-card/healthcard.js b/IOReportSysMP/miniprogram/pages/health-card/healthcard.js deleted file mode 100644 index 2a6f4e7..0000000 --- a/IOReportSysMP/miniprogram/pages/health-card/healthcard.js +++ /dev/null @@ -1,263 +0,0 @@ -"use strict"; -var __assign = (this && this.__assign) || function () { - __assign = Object.assign || function(t) { - for (var s, i = 1, n = arguments.length; i < n; i++) { - s = arguments[i]; - for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) - t[p] = s[p]; - } - return t; - }; - return __assign.apply(this, arguments); -}; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; - return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; - function verb(n) { return function (v) { return step([n, v]); }; } - function step(op) { - if (f) throw new TypeError("Generator is already executing."); - while (_) try { - if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; - if (y = 0, t) op = [op[0] & 2, t.value]; - switch (op[0]) { - case 0: case 1: t = op; break; - case 4: _.label++; return { value: op[1], done: false }; - case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; - default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } - if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } - if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } - if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } - if (t[2]) _.ops.pop(); - _.trys.pop(); continue; - } - op = body.call(thisArg, _); - } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } - if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; - } -}; -var __importDefault = (this && this.__importDefault) || function (mod) { - return (mod && mod.__esModule) ? mod : { "default": mod }; -}; -Object.defineProperty(exports, "__esModule", { value: true }); -var constant_1 = __importDefault(require("../../utils/constant")); -var index_1 = __importDefault(require("../../services/index")); -var util_1 = require("../../utils/util"); -var recordType = { - GREEN: '绿色', - YELLOW: "黄色", - RED: '红色' -}; -// pages/health-card/healthcard.ts -Page({ - /** - * 页面的初始数据 - */ - data: { - count: 2, - files: [], - images: [], - uploadImg: "", - base64File: "", - showUpload: true, - user: {}, - nomore: false, - recordType: recordType - }, - clearImg: function (e) { - this.setData({ - uploadImg: "", - base64File: "", - showUpload: true - }); - }, - chooseBase64Image: function () { - var _this = this; - var that = this; - wx.showLoading({ title: '图片上传中' }); - return new Promise(function (resolve, reject) { - wx.chooseImage({ - sizeType: ['original', 'compressed'], - count: 1, - sourceType: ['album'], - success: function (res) { - var tempFilePath = res.tempFilePaths[0]; - var tempFile = res.tempFiles[0]; - console.log(res); - console.log(tempFile); - // 返回选定照片的本地文件路径，tempFilePath可以作为img标签的src属性显示图片 - that.setData({ - uploadImg: tempFilePath, - }); - wx.getImageInfo({ - src: tempFilePath, - success: function (imageInfo) { - var imgType = imageInfo.type; - wx.getFileSystemManager().readFile({ - filePath: tempFilePath, - encoding: "base64", - success: function (res) { - //返回base64格式 - var base64Str = 'data:image/' + imgType + ';base64,' + res.data; - console.log(base64Str); - _this.setData({ base64File: base64Str, showUpload: false }); - resolve(base64Str); - wx.hideLoading(); - }, - fail: function (err) { - console.log(err); - reject(err); - } - }); - } - }); - }, - fail: function (err) { - console.log(err); - } - }); - }); - }, - loadMore: function () { - return __awaiter(this, void 0, void 0, function () { - var count; - return __generator(this, function (_a) { - if (this.data.nomore) { - wx.showToast({ title: "已经到头了~" }); - } - else { - count = this.data.count + 2; - this.setData({ count: count }); - //console.log(this.data) - this.getCards(this.data.user); - } - return [2 /*return*/]; - }); - }); - }, - getCards: function (query) { - return __awaiter(this, void 0, void 0, function () { - var res, records; - var _this = this; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: return [4 /*yield*/, index_1.default.API.materialUpload.getIORecordsList.request({ userID: query.userID, type: "health", count: this.data.count })]; - case 1: - res = _a.sent(); - // console.log(res); - if (res && res.data) { - records = res.data; - if (records.length < this.data.count) { - this.setData({ nomore: true }); - } - records.map(function (record) { - var imagePath = record.imagePath; - if (imagePath) { - var url = util_1.BASE_URL + "/api/image/get" + imagePath; - var tempMap = _this.data.images; - tempMap.push(url); - _this.setData({ images: tempMap }); - } - }); - this.setData({ files: res.data }); - } - return [2 /*return*/]; - } - }); - }); - }, - previewImg: function (e) { - console.log(e.currentTarget.dataset); - console.log(this.data.fileUrls); - var urls = []; - urls.push(e.currentTarget.dataset.src); - wx.previewImage({ - urls: urls, - }); - }, - onSubmit: function (_a) { - var detail = _a.detail; - return __awaiter(this, void 0, void 0, function () { - var submitRecord, res, reportid; - return __generator(this, function (_b) { - switch (_b.label) { - case 0: - // TODO gen order - if (!this.data.teacherID) { - wx.showToast({ - title: '提交失败，缺少用户信息', - icon: 'none' - }); - } - submitRecord = __assign(__assign({}, detail.value), { ioType: this.data.ioTypesArray.indexOf(this.data.ioType), teacherID: this.data.teacherID, commitTime: this.data.applyDate + ' ' + this.data.applyTime + ":00" }); - return [4 /*yield*/, index_1.default.API.iORecords.addIORecord.request(submitRecord)]; - case 1: - res = _b.sent(); - console.log(res); - if (res && res.data) { - reportid = res.data; - wx.setStorageSync("myReport/myReport", reportid); - } - return [2 /*return*/]; - } - }); - }); - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function () { - // wx.removeStorageSync(constant.USER_INFO); - var user = wx.getStorageSync(constant_1.default.USER_INFO); - if (!user) { - wx.navigateTo({ url: "../../index/index" }); - } - this.getCards(user); - this.setData(__assign(__assign({}, this.data), user)); - }, - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - }, - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - }, - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - }, - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - }, - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - }, - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - }, - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - } -}); diff --git a/IOReportSysMP/miniprogram/pages/health-card/healthcard.json b/IOReportSysMP/miniprogram/pages/health-card/healthcard.json deleted file mode 100644 index 8835af0..0000000 --- a/IOReportSysMP/miniprogram/pages/health-card/healthcard.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/IOReportSysMP/miniprogram/pages/health-card/healthcard.scss b/IOReportSysMP/miniprogram/pages/health-card/healthcard.scss deleted file mode 100644 index 37864f2..0000000 --- a/IOReportSysMP/miniprogram/pages/health-card/healthcard.scss +++ /dev/null @@ -1,66 +0,0 @@ -.card-container { - margin: 20rpx; - background-color: var(--color-gray-0); - box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); - font-size: 17px; - // font-weight: 550; - - .card-col-1 { - padding: 24rpx 0; - display: flex; - width: auto; - - & yinput:nth-child(1) { - flex: 4 1 50px; - margin: 0 5rpx; - } - - & yinput:nth-child(2) { - flex: 7 1 50px; - margin:0 5rpx; - } - } - -} - - -.input-container { - padding-bottom: 80rpx; - - .card-col-1 { - display: flex; - margin: 0 2px; - - :nth-child(n) { - flex: 1 1 0; - } - } -} - - -.ui_uploader_item{ - padding: 0 20rpx; - display: flex; - justify-content: flex-start; - icon{ - flex:1 - } - .image{ - flex:15; - padding-bottom: 100rpx; - image{ - width:500rpx - } - } - - .submit-button { - position: fixed; - bottom: 0; - left: 0; - background-color: var(--color-primary); - color: white; - width: 100%; - border-radius: 0; - z-index: 99; - } -} \ No newline at end of file diff --git a/IOReportSysMP/miniprogram/pages/health-card/healthcard.ts b/IOReportSysMP/miniprogram/pages/health-card/healthcard.ts deleted file mode 100644 index a9018f7..0000000 --- a/IOReportSysMP/miniprogram/pages/health-card/healthcard.ts +++ /dev/null @@ -1,216 +0,0 @@ -import constant from "../../utils/constant" -import { IORecords, User } from '../../services/baseClass' -import services from "../../services/index" -import { BASE_URL } from '../../utils/util'; -const recordType = { - GREEN: '绿色', - YELLOW: "黄色", - RED:'红色' -} -// pages/health-card/healthcard.ts -Page({ - - /** - * 页面的初始数据 - */ - data: { - count:2, - files:[], - images:[], - uploadImg:"", - base64File:"", - showUpload:true, - user:{}, - nomore:false, - recordType - }, - clearImg(e) { - this.setData({ - uploadImg: "", - base64File: "", - showUpload: true - }) - }, - chooseBase64Image() { - const that = this; - wx.showLoading({ title: '图片上传中' }); - return new Promise((resolve, reject) => { - wx.chooseImage({ - sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 - count:1, - sourceType: ['album'], // 可以指定来源是相册还是相机，默认二者都有 - success: (res)=> { - let tempFilePath = res.tempFilePaths[0]; - let tempFile = res.tempFiles[0]; - console.log(res); - console.log(tempFile); - - // 返回选定照片的本地文件路径，tempFilePath可以作为img标签的src属性显示图片 - that.setData({ - uploadImg: tempFilePath, - }); - wx.getImageInfo({ - src:tempFilePath, - success:(imageInfo)=>{ - var imgType = imageInfo.type - wx.getFileSystemManager().readFile({ - filePath: tempFilePath, //选择图片返回的相对路径 - encoding: "base64", //这个是很重要的 - success: res => { //成功的回调 - //返回base64格式 - var base64Str = 'data:image/' + imgType + ';base64,' + res.data - - console.log(base64Str) - this.setData({base64File:base64Str,showUpload:false}) - resolve(base64Str) - wx.hideLoading(); - }, - fail: err => { - console.log(err) - reject(err) - } - }) - } - }) - }, - fail: (err) => { - console.log(err) - } - }); - }) - }, - - async loadMore() { - if(this.data.nomore){ - wx.showToast({title:"已经到头了~"}) - - }else{ - let count = this.data.count+2; - this.setData({count:count}); - //console.log(this.data) - this.getCards(this.data.user) - } - - }, - async getCards(query?:any){ - - let res = await services.API.materialUpload.getIORecordsList.request({userID:query.userID,type:"health",count:this.data.count}); - - // console.log(res); - if(res&&res.data){ - let records = res.data - if(records.length{ - let imagePath = record.imagePath - if(imagePath){ - let url = BASE_URL + "/api/image/get"+imagePath; - let tempMap = this.data.images; - tempMap.push(url); - this.setData({images:tempMap}) - } - }) - this.setData({files:res.data}) - - } - }, - previewImg(e) { - console.log(e.currentTarget.dataset); - console.log(this.data.fileUrls); - let urls = []; - urls.push(e.currentTarget.dataset.src) - wx.previewImage({ - urls: urls, // 需要预览的图片http链接列表 - }); - }, - onSubmit:async function({ detail }: { detail: any}) { - // TODO gen order - if(!this.data.teacherID){ - wx.showToast({ - title: '提交失败，缺少用户信息', - icon: 'none' - }); - } - const submitRecord: IORecords = { - ...detail.value, - ioType:this.data.ioTypesArray.indexOf(this.data.ioType), - teacherID:this.data.teacherID, - commitTime: this.data.applyDate + ' ' + this.data.applyTime+":00", - } - let res = await services.API.iORecords.addIORecord.request(submitRecord); - console.log(res); - - if(res&&res.data){ - - let reportid = res.data; - wx.setStorageSync("myReport/myReport", reportid) - } - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad() { - // wx.removeStorageSync(constant.USER_INFO); - let user = wx.getStorageSync(constant.USER_INFO); - if(!user){ - wx.navigateTo({url:"../../index/index"}) - } - this.getCards(user) - this.setData({ - ...this.data, - ...(user as User) - }) - }, - - - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } -}) \ No newline at end of file diff --git a/IOReportSysMP/miniprogram/pages/health-card/healthcard.wxml b/IOReportSysMP/miniprogram/pages/health-card/healthcard.wxml deleted file mode 100644 index 8deaa70..0000000 --- a/IOReportSysMP/miniprogram/pages/health-card/healthcard.wxml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - 查看更多 - - - - 到头了~ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/IOReportSysMP/miniprogram/pages/index/index.js b/IOReportSysMP/miniprogram/pages/index/index.js index f2a1c36..3ee1382 100644 --- a/IOReportSysMP/miniprogram/pages/index/index.js +++ b/IOReportSysMP/miniprogram/pages/index/index.js @@ -160,19 +160,19 @@ Page({ }, uploadTravelCard: function () { var that = this; - wx.showLoading({ title: '行程码上传中' }); + wx.showLoading({ title: '行程卡上传中' }); this.chooseBase64Image().then(function (suc) { orderApi_1.default.uploadTripCode({ ImageBase64: suc.base64File, ext: suc.imgType }).then(function (res) { wx.hideLoading(); if (res && res.data && res.data.success) { - wx.showLoading({ title: "行程码上传成功，刷新中~" }); + wx.showLoading({ title: "行程卡上传成功，刷新中~" }); that.onLoad(); setTimeout(function () { wx.hideLoading(); }, 2000); } else { var message = res.data.message; wx.showModal({ - title: "行程码上传错误", + title: "行程卡上传错误", content: message, showCancel: false }); @@ -180,7 +180,7 @@ Page({ }).catch(function (err) { wx.hideLoading(); wx.showModal({ - title: "行程码上传错误", + title: "行程卡上传错误", content: "uploadTripCode===" + JSON.stringify(err), showCancel: false }); @@ -188,7 +188,7 @@ Page({ }).catch(function (err) { wx.hideLoading(); wx.showModal({ - title: "行程码上传错误", + title: "行程卡上传错误", content: "chooseBase64Image===" + JSON.stringify(err), showCancel: false }); diff --git a/IOReportSysMP/miniprogram/pages/index/index.ts b/IOReportSysMP/miniprogram/pages/index/index.ts index 6b2add6..c2b7309 100644 --- a/IOReportSysMP/miniprogram/pages/index/index.ts +++ b/IOReportSysMP/miniprogram/pages/index/index.ts @@ -92,7 +92,7 @@ Page({ }, uploadHealthCard(){ - let that = this + let that = this wx.showLoading({ title: '健康码上传中' }); this.chooseBase64Image().then(suc=>{ orderAPI.uploadHealthCode({ImageBase64:suc.base64File,ext:'.'+suc.imgType}).then(res=>{ @@ -128,7 +128,8 @@ Page({ }, uploadTravelCard(){ let that = this - wx.showLoading({ title: '行程码上传中' }); + + wx.showLoading({ title: '行程卡上传中' }); this.chooseBase64Image().then(suc=>{ orderAPI.uploadTripCode({ImageBase64:suc.base64File,ext:'.'+suc.imgType}).then(res=>{ let val = JSON.parse(res.data.return_val) @@ -136,18 +137,18 @@ Page({ wx.setStorageSync(constant.USER_INFO,val) wx.hideLoading() if(res&&res.data&&res.data.success){ - wx.showToast({title:"行程码上传成功~",icon:"success"}) + wx.showToast({title:"行程卡上传成功~",icon:"success"}) }else{ let message=res.data.message wx.showModal({ - title:"行程码上传错误", + title:"行程卡上传错误", content:message, showCancel:false}) } }).catch(err=>{ wx.hideLoading() wx.showModal({ - title:"行程码上传错误", + title:"行程卡上传错误", content:"uploadTripCode==="+JSON.stringify(err), showCancel:false}) }) @@ -155,7 +156,7 @@ Page({ wx.hideLoading() if(err&&err!=""){ wx.showModal({ - title:"行程码上传错误", + title:"行程卡上传错误", content:"chooseBase64Image==="+JSON.stringify(err), showCancel:false}) } diff --git a/IOReportSysMP/miniprogram/pages/index/index.wxml b/IOReportSysMP/miniprogram/pages/index/index.wxml index aebb093..473fb5d 100644 --- a/IOReportSysMP/miniprogram/pages/index/index.wxml +++ b/IOReportSysMP/miniprogram/pages/index/index.wxml @@ -21,7 +21,7 @@ - + @@ -29,14 +29,14 @@ - + 上传健康码（剩余{{user.HealthCodeUploadTimesRemainInToday}}次） - 上传行程码（剩余{{user.TravelCardUploadTimesRemainInToday}}次） + 上传行程卡（剩余{{user.TravelCardUploadTimesRemainInToday}}次） diff --git a/IOReportSysMP/miniprogram/pages/travel-card/travelcard.js b/IOReportSysMP/miniprogram/pages/travel-card/travelcard.js deleted file mode 100644 index 5e50887..0000000 --- a/IOReportSysMP/miniprogram/pages/travel-card/travelcard.js +++ /dev/null @@ -1,261 +0,0 @@ -"use strict"; -var __assign = (this && this.__assign) || function () { - __assign = Object.assign || function(t) { - for (var s, i = 1, n = arguments.length; i < n; i++) { - s = arguments[i]; - for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) - t[p] = s[p]; - } - return t; - }; - return __assign.apply(this, arguments); -}; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; - return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; - function verb(n) { return function (v) { return step([n, v]); }; } - function step(op) { - if (f) throw new TypeError("Generator is already executing."); - while (_) try { - if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; - if (y = 0, t) op = [op[0] & 2, t.value]; - switch (op[0]) { - case 0: case 1: t = op; break; - case 4: _.label++; return { value: op[1], done: false }; - case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; - default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } - if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } - if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } - if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } - if (t[2]) _.ops.pop(); - _.trys.pop(); continue; - } - op = body.call(thisArg, _); - } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } - if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; - } -}; -var __importDefault = (this && this.__importDefault) || function (mod) { - return (mod && mod.__esModule) ? mod : { "default": mod }; -}; -Object.defineProperty(exports, "__esModule", { value: true }); -var constant_1 = __importDefault(require("../../utils/constant")); -var index_1 = __importDefault(require("../../services/index")); -var util_1 = require("../../utils/util"); -var recordType = { - GREEN: '绿码', - YELLOW: "黄码", - RED: '红码' -}; -// pages/travel-card/travelcard.ts -Page({ - /** - * 页面的初始数据 - */ - data: { - files: [], - images: [], - uploadImg: "", - base64File: "", - showUpload: true, - user: {}, - count: 2, - nomore: false, - recordType: recordType - }, - clearImg: function (e) { - this.setData({ - uploadImg: "", - base64File: "", - showUpload: true - }); - }, - chooseBase64Image: function () { - var _this = this; - var that = this; - wx.showLoading({ title: '图片上传中' }); - return new Promise(function (resolve, reject) { - wx.chooseImage({ - sizeType: ['original', 'compressed'], - count: 1, - sourceType: ['album'], - success: function (res) { - var tempFilePath = res.tempFilePaths[0]; - var tempFile = res.tempFiles[0]; - console.log(res); - console.log(tempFile); - // 返回选定照片的本地文件路径，tempFilePath可以作为img标签的src属性显示图片 - that.setData({ - uploadImg: tempFilePath, - }); - wx.getImageInfo({ - src: tempFilePath, - success: function (imageInfo) { - var imgType = imageInfo.type; - wx.getFileSystemManager().readFile({ - filePath: tempFilePath, - encoding: "base64", - success: function (res) { - //返回base64格式 - var base64Str = 'data:image/' + imgType + ';base64,' + res.data; - console.log(base64Str); - _this.setData({ base64File: base64Str, showUpload: false }); - resolve(base64Str); - wx.hideLoading(); - }, - fail: function (err) { - console.log(err); - reject(err); - } - }); - } - }); - }, - fail: function (err) { - console.log(err); - } - }); - }); - }, - previewImg: function (e) { - var urls = []; - urls.push(e.currentTarget.dataset.src); - wx.previewImage({ - urls: urls, - }); - }, - loadMore: function () { - return __awaiter(this, void 0, void 0, function () { - var count; - return __generator(this, function (_a) { - if (this.data.nomore) { - wx.showToast({ title: "已经到头了~" }); - } - else { - count = this.data.count + 2; - this.setData({ count: count }); - //console.log(this.data) - this.getCards(this.data.user); - } - return [2 /*return*/]; - }); - }); - }, - getCards: function (user) { - return __awaiter(this, void 0, void 0, function () { - var res, records; - var _this = this; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: return [4 /*yield*/, index_1.default.API.materialUpload.getIORecordsList.request({ userID: user.userID, type: "travel", count: this.data.count })]; - case 1: - res = _a.sent(); - //console.log(res); - if (res && res.data) { - records = res.data; - if (records.length < this.data.count) { - this.setData({ nomore: true }); - } - records.map(function (record) { - var imagePath = record.imagePath; - if (imagePath) { - var url = util_1.BASE_URL + "/api/image/get" + imagePath; - var tempMap = _this.data.images; - tempMap.push(url); - _this.setData({ images: tempMap }); - } - }); - this.setData({ files: res.data }); - } - return [2 /*return*/]; - } - }); - }); - }, - onSubmit: function (_a) { - var detail = _a.detail; - return __awaiter(this, void 0, void 0, function () { - var submitRecord, res, reportid; - return __generator(this, function (_b) { - switch (_b.label) { - case 0: - // TODO gen order - if (!this.data.teacherID) { - wx.showToast({ - title: '提交失败，缺少用户信息', - icon: 'none' - }); - } - submitRecord = __assign(__assign({}, detail.value), { ioType: this.data.ioTypesArray.indexOf(this.data.ioType), teacherID: this.data.teacherID, commitTime: this.data.applyDate + ' ' + this.data.applyTime + ":00" }); - return [4 /*yield*/, index_1.default.API.iORecords.addIORecord.request(submitRecord)]; - case 1: - res = _b.sent(); - console.log(res); - if (res && res.data) { - reportid = res.data; - wx.setStorageSync("myReport/myReport", reportid); - } - return [2 /*return*/]; - } - }); - }); - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function () { - // wx.removeStorageSync(constant.USER_INFO); - var user = wx.getStorageSync(constant_1.default.USER_INFO); - if (!user) { - wx.navigateTo({ url: "../../index/index" }); - } - this.getCards(user); - this.setData(__assign(__assign({}, this.data), user)); - }, - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - }, - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - }, - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - }, - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - }, - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - }, - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - }, - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - } -}); diff --git a/IOReportSysMP/miniprogram/pages/travel-card/travelcard.json b/IOReportSysMP/miniprogram/pages/travel-card/travelcard.json deleted file mode 100644 index 8835af0..0000000 --- a/IOReportSysMP/miniprogram/pages/travel-card/travelcard.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/IOReportSysMP/miniprogram/pages/travel-card/travelcard.scss b/IOReportSysMP/miniprogram/pages/travel-card/travelcard.scss deleted file mode 100644 index cef1dc9..0000000 --- a/IOReportSysMP/miniprogram/pages/travel-card/travelcard.scss +++ /dev/null @@ -1,66 +0,0 @@ -.card-container { - margin: 20rpx; - background-color: var(--color-gray-0); - box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); - font-size: 17px; - // font-weight: 550; - - .card-col-1 { - padding: 24rpx 0; - display: flex; - width: auto; - - & yinput:nth-child(1) { - flex: 4 1 50px; - margin: 0 5rpx; - } - - & yinput:nth-child(2) { - flex: 7 1 50px; - margin:0 5rpx; - } - } - -} - - -.input-container { - padding-bottom: 80rpx; - - .card-col-1 { - display: flex; - margin: 0 2px; - - :nth-child(n) { - flex: 1 1 0; - } - } -} - - - -.ui_uploader_item{ - padding: 0 20rpx; - display: flex; - justify-content: flex-start; - icon{ - flex:1 - } - .image{ - flex:15; - padding-bottom: 100rpx; - image{ - width:500rpx - } - } - .submit-button { - position: fixed; - bottom: 0; - left: 0; - background-color: var(--color-primary); - color: white; - width: 100%; - border-radius: 0; - z-index: 99; - } -} \ No newline at end of file diff --git a/IOReportSysMP/miniprogram/pages/travel-card/travelcard.ts b/IOReportSysMP/miniprogram/pages/travel-card/travelcard.ts deleted file mode 100644 index d68c41c..0000000 --- a/IOReportSysMP/miniprogram/pages/travel-card/travelcard.ts +++ /dev/null @@ -1,212 +0,0 @@ -import constant from "../../utils/constant" -import { IORecords, User } from '../../services/baseClass' -import services from "../../services/index" -import { BASE_URL } from '../../utils/util'; -const recordType = { - GREEN: '绿码', - YELLOW: "黄码", - RED:'红码' -} -// pages/travel-card/travelcard.ts -Page({ - - /** - * 页面的初始数据 - */ - data: { - files:[], - images:[], - uploadImg:"", - base64File:"", - showUpload:true, - user:{}, - count:2, - nomore:false, - recordType - }, - clearImg(e) { - this.setData({ - uploadImg: "", - base64File: "", - showUpload: true - }) - }, - chooseBase64Image() { - const that = this; - wx.showLoading({ title: '图片上传中' }); - return new Promise((resolve, reject) => { - wx.chooseImage({ - sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 - count:1, - sourceType: ['album'], // 可以指定来源是相册还是相机，默认二者都有 - success: (res)=> { - let tempFilePath = res.tempFilePaths[0]; - let tempFile = res.tempFiles[0]; - console.log(res); - console.log(tempFile); - - // 返回选定照片的本地文件路径，tempFilePath可以作为img标签的src属性显示图片 - that.setData({ - uploadImg: tempFilePath, - }); - wx.getImageInfo({ - src:tempFilePath, - success:(imageInfo)=>{ - var imgType = imageInfo.type - wx.getFileSystemManager().readFile({ - filePath: tempFilePath, //选择图片返回的相对路径 - encoding: "base64", //这个是很重要的 - success: res => { //成功的回调 - //返回base64格式 - var base64Str = 'data:image/' + imgType + ';base64,' + res.data - - console.log(base64Str) - this.setData({base64File:base64Str,showUpload:false}) - resolve(base64Str) - wx.hideLoading(); - }, - fail: err => { - console.log(err) - reject(err) - } - }) - } - }) - }, - fail: (err) => { - console.log(err) - } - }); - }) - }, - previewImg(e) { - let urls = []; - urls.push(e.currentTarget.dataset.src) - wx.previewImage({ - urls: urls, // 需要预览的图片http链接列表 - }); - }, - async loadMore() { - if(this.data.nomore){ - wx.showToast({title:"已经到头了~"}) - - }else{ - let count = this.data.count+2; - this.setData({count:count}); - //console.log(this.data) - this.getCards(this.data.user) - } - }, - async getCards(user:any){ - - let res = await services.API.materialUpload.getIORecordsList.request({userID:user.userID,type:"travel",count:this.data.count}); - - //console.log(res); - if(res&&res.data){ - let records = res.data - if(records.length{ - let imagePath = record.imagePath - if(imagePath){ - let url = BASE_URL + "/api/image/get"+imagePath; - let tempMap = this.data.images; - tempMap.push(url); - this.setData({images:tempMap}) - } - }) - this.setData({files:res.data}) - - } - }, - onSubmit:async function({ detail }: { detail: any}) { - // TODO gen order - if(!this.data.teacherID){ - wx.showToast({ - title: '提交失败，缺少用户信息', - icon: 'none' - }); - } - const submitRecord: IORecords = { - ...detail.value, - ioType:this.data.ioTypesArray.indexOf(this.data.ioType), - teacherID:this.data.teacherID, - commitTime: this.data.applyDate + ' ' + this.data.applyTime+":00", - } - let res = await services.API.iORecords.addIORecord.request(submitRecord); - console.log(res); - - if(res&&res.data){ - - let reportid = res.data; - wx.setStorageSync("myReport/myReport", reportid) - } - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad() { - // wx.removeStorageSync(constant.USER_INFO); - let user = wx.getStorageSync(constant.USER_INFO); - if(!user){ - wx.navigateTo({url:"../../index/index"}) - } - this.getCards(user); - this.setData({ - ...this.data, - ...(user as User) - }) - }, - - - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } -}) \ No newline at end of file diff --git a/IOReportSysMP/miniprogram/pages/travel-card/travelcard.wxml b/IOReportSysMP/miniprogram/pages/travel-card/travelcard.wxml deleted file mode 100644 index 8f8b2fb..0000000 --- a/IOReportSysMP/miniprogram/pages/travel-card/travelcard.wxml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - 查看更多 - - - - 到头了~ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/IOReportSysMP/miniprogram/utils/util.ts b/IOReportSysMP/miniprogram/utils/util.ts index 3c3a5ad..f1610a5 100644 --- a/IOReportSysMP/miniprogram/utils/util.ts +++ b/IOReportSysMP/miniprogram/utils/util.ts @@ -206,7 +206,7 @@ export const genToken = (wechatID?:string)=>{ wx.showModal({title:"token生成失败，请联系管理员！",showCancel:false}) } let token = randomStr.concat(";",nowStr,";",userid); - // console.log("token",token) + console.log("token",token) let tokenEncode = encrypt(token); return tokenEncode; diff --git a/IOReportSysMP/miniprogram/utils/weapp-qrcode/weapp-qrcode.js b/IOReportSysMP/miniprogram/utils/weapp-qrcode/weapp-qrcode.js deleted file mode 100644 index 638cb0c..0000000 --- a/IOReportSysMP/miniprogram/utils/weapp-qrcode/weapp-qrcode.js +++ /dev/null @@ -1,1625 +0,0 @@ -//--------------------------------------------------------------------- -// -// QR Code Generator 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 -// -//--------------------------------------------------------------------- - -//---------------微信小程序基于base64生成二维码插件修改------------------- -/* - * @Modified: Pudon - * @demoURL: https://github.com/Pudon/weapp-qrcode - * @Date: 2018-09-11 14:00:05 - * @Last Modified by: Pudon - * @Last Modified time: 2018-09-12 16:33:19 - */ -//--------------------------------------------------------------------- - -/** - * qrcode - * @param typeNumber 1 to 40 - * @param errorCorrectLevel 'L','M','Q','H' - */ -var qrcode = function(typeNumber, errorCorrectLevel) { - - var PAD0 = 0xEC; - var PAD1 = 0x11; - - var _typeNumber = typeNumber; - var _errorCorrectLevel = QRErrorCorrectLevel[errorCorrectLevel]; - var _modules = null; - var _moduleCount = 0; - var _dataCache = null; - var _dataList = new Array(); - - var _this = {}; - - var makeImpl = function(test, maskPattern) { - - _moduleCount = _typeNumber * 4 + 17; - _modules = function(moduleCount) { - var modules = new Array(moduleCount); - for (var row = 0; row < moduleCount; row += 1) { - modules[row] = new Array(moduleCount); - for (var col = 0; col < moduleCount; col += 1) { - modules[row][col] = null; - } - } - return modules; - }(_moduleCount); - - setupPositionProbePattern(0, 0); - setupPositionProbePattern(_moduleCount - 7, 0); - setupPositionProbePattern(0, _moduleCount - 7); - setupPositionAdjustPattern(); - setupTimingPattern(); - setupTypeInfo(test, maskPattern); - - if (_typeNumber >= 7) { - setupTypeNumber(test); - } - - if (_dataCache == null) { - _dataCache = createData(_typeNumber, _errorCorrectLevel, _dataList); - } - - mapData(_dataCache, maskPattern); - }; - - var setupPositionProbePattern = function(row, col) { - - for (var r = -1; r <= 7; r += 1) { - - if (row + r <= -1 || _moduleCount <= row + r) continue; - - for (var c = -1; c <= 7; c += 1) { - - if (col + c <= -1 || _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) ) { - _modules[row + r][col + c] = true; - } else { - _modules[row + r][col + c] = false; - } - } - } - }; - - var getBestMaskPattern = function() { - - var minLostPoint = 0; - var pattern = 0; - - for (var i = 0; i < 8; i += 1) { - - makeImpl(true, i); - - var lostPoint = QRUtil.getLostPoint(_this); - - if (i == 0 || minLostPoint > lostPoint) { - minLostPoint = lostPoint; - pattern = i; - } - } - - return pattern; - }; - - var setupTimingPattern = function() { - - for (var r = 8; r < _moduleCount - 8; r += 1) { - if (_modules[r][6] != null) { - continue; - } - _modules[r][6] = (r % 2 == 0); - } - - for (var c = 8; c < _moduleCount - 8; c += 1) { - if (_modules[6][c] != null) { - continue; - } - _modules[6][c] = (c % 2 == 0); - } - }; - - var setupPositionAdjustPattern = function() { - - var pos = QRUtil.getPatternPosition(_typeNumber); - - for (var i = 0; i < pos.length; i += 1) { - - for (var j = 0; j < pos.length; j += 1) { - - var row = pos[i]; - var col = pos[j]; - - if (_modules[row][col] != null) { - continue; - } - - for (var r = -2; r <= 2; r += 1) { - - for (var c = -2; c <= 2; c += 1) { - - if (r == -2 || r == 2 || c == -2 || c == 2 - || (r == 0 && c == 0) ) { - _modules[row + r][col + c] = true; - } else { - _modules[row + r][col + c] = false; - } - } - } - } - } - }; - - var setupTypeNumber = function(test) { - - var bits = QRUtil.getBCHTypeNumber(_typeNumber); - - for (var i = 0; i < 18; i += 1) { - var mod = (!test && ( (bits >> i) & 1) == 1); - _modules[Math.floor(i / 3)][i % 3 + _moduleCount - 8 - 3] = mod; - } - - for (var i = 0; i < 18; i += 1) { - var mod = (!test && ( (bits >> i) & 1) == 1); - _modules[i % 3 + _moduleCount - 8 - 3][Math.floor(i / 3)] = mod; - } - }; - - var setupTypeInfo = function(test, maskPattern) { - - var data = (_errorCorrectLevel << 3) | maskPattern; - var bits = QRUtil.getBCHTypeInfo(data); - - // vertical - for (var i = 0; i < 15; i += 1) { - - var mod = (!test && ( (bits >> i) & 1) == 1); - - if (i < 6) { - _modules[i][8] = mod; - } else if (i < 8) { - _modules[i + 1][8] = mod; - } else { - _modules[_moduleCount - 15 + i][8] = mod; - } - } - - // horizontal - for (var i = 0; i < 15; i += 1) { - - var mod = (!test && ( (bits >> i) & 1) == 1); - - if (i < 8) { - _modules[8][_moduleCount - i - 1] = mod; - } else if (i < 9) { - _modules[8][15 - i - 1 + 1] = mod; - } else { - _modules[8][15 - i - 1] = mod; - } - } - - // fixed module - _modules[_moduleCount - 8][8] = (!test); - }; - - var mapData = function(data, maskPattern) { - - var inc = -1; - var row = _moduleCount - 1; - var bitIndex = 7; - var byteIndex = 0; - var maskFunc = QRUtil.getMaskFunction(maskPattern); - - for (var col = _moduleCount - 1; col > 0; col -= 2) { - - if (col == 6) col -= 1; - - while (true) { - - for (var c = 0; c < 2; c += 1) { - - if (_modules[row][col - c] == null) { - - var dark = false; - - if (byteIndex < data.length) { - dark = ( ( (data[byteIndex] >>> bitIndex) & 1) == 1); - } - - var mask = maskFunc(row, col - c); - - if (mask) { - dark = !dark; - } - - _modules[row][col - c] = dark; - bitIndex -= 1; - - if (bitIndex == -1) { - byteIndex += 1; - bitIndex = 7; - } - } - } - - row += inc; - - if (row < 0 || _moduleCount <= row) { - row -= inc; - inc = -inc; - break; - } - } - } - }; - - var 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 += 1) { - - 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 += 1) { - dcdata[r][i] = 0xff & buffer.getBuffer()[i + offset]; - } - offset += dcCount; - - var rsPoly = QRUtil.getErrorCorrectPolynomial(ecCount); - var rawPoly = 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 += 1) { - var modIndex = i + modPoly.getLength() - ecdata[r].length; - ecdata[r][i] = (modIndex >= 0)? modPoly.getAt(modIndex) : 0; - } - } - - var totalCodeCount = 0; - for (var i = 0; i < rsBlocks.length; i += 1) { - totalCodeCount += rsBlocks[i].totalCount; - } - - var data = new Array(totalCodeCount); - var index = 0; - - for (var i = 0; i < maxDcCount; i += 1) { - for (var r = 0; r < rsBlocks.length; r += 1) { - if (i < dcdata[r].length) { - data[index] = dcdata[r][i]; - index += 1; - } - } - } - - for (var i = 0; i < maxEcCount; i += 1) { - for (var r = 0; r < rsBlocks.length; r += 1) { - if (i < ecdata[r].length) { - data[index] = ecdata[r][i]; - index += 1; - } - } - } - - return data; - }; - - var createData = function(typeNumber, errorCorrectLevel, dataList) { - - var rsBlocks = QRRSBlock.getRSBlocks(typeNumber, errorCorrectLevel); - - var buffer = qrBitBuffer(); - - for (var i = 0; i < dataList.length; i += 1) { - var data = dataList[i]; - buffer.put(data.getMode(), 4); - buffer.put(data.getLength(), QRUtil.getLengthInBits(data.getMode(), typeNumber) ); - data.write(buffer); - } - - // calc num max data. - var totalDataCount = 0; - for (var i = 0; i < rsBlocks.length; i += 1) { - totalDataCount += rsBlocks[i].dataCount; - } - - if (buffer.getLengthInBits() > totalDataCount * 8) { - throw new Error('code length overflow. (' - + buffer.getLengthInBits() - + '>' - + totalDataCount * 8 - + ')'); - } - - // end code - if (buffer.getLengthInBits() + 4 <= totalDataCount * 8) { - buffer.put(0, 4); - } - - // padding - while (buffer.getLengthInBits() % 8 != 0) { - buffer.putBit(false); - } - - // padding - while (true) { - - if (buffer.getLengthInBits() >= totalDataCount * 8) { - break; - } - buffer.put(PAD0, 8); - - if (buffer.getLengthInBits() >= totalDataCount * 8) { - break; - } - buffer.put(PAD1, 8); - } - - return createBytes(buffer, rsBlocks); - }; - - _this.addData = function(data) { - var newData = qr8BitByte(data); - _dataList.push(newData); - _dataCache = null; - }; - - _this.isDark = function(row, col) { - if (row < 0 || _moduleCount <= row || col < 0 || _moduleCount <= col) { - throw new Error(row + ',' + col); - } - return _modules[row][col]; - }; - - _this.getModuleCount = function() { - return _moduleCount; - }; - - _this.make = function() { - makeImpl(false, getBestMaskPattern() ); - }; - - _this.createTableTag = function(cellSize, margin) { - - cellSize = cellSize || 2; - margin = (typeof margin == 'undefined')? cellSize * 4 : margin; - - var qrHtml = ''; - - qrHtml += ''; - qrHtml += ''; - - for (var r = 0; r < _this.getModuleCount(); r += 1) { - - qrHtml += ''; - - for (var c = 0; c < _this.getModuleCount(); c += 1) { - qrHtml += ''; - } - - qrHtml += ''; - qrHtml += '
'; - } - - qrHtml += '
'; - - return qrHtml; - }; - - _this.createImgTag = function(cellSize, margin, size) { - - cellSize = cellSize || 2; - margin = (typeof margin == 'undefined')? cellSize * 4 : margin; - - var min = margin; - var max = _this.getModuleCount() * cellSize + margin; - - return createImgTag(size, size, function(x, y) { - if (min <= x && x < max && min <= y && y < max) { - var c = Math.floor( (x - min) / cellSize); - var r = Math.floor( (y - min) / cellSize); - return _this.isDark(r, c)? 0 : 1; - } else { - return 1; - } - } ); - }; - - return _this; -}; - -//--------------------------------------------------------------------- -// qrcode.stringToBytes -//--------------------------------------------------------------------- - -qrcode.stringToBytes = function(s) { - var bytes = new Array(); - for (var i = 0; i < s.length; i += 1) { - var c = s.charCodeAt(i); - bytes.push(c & 0xff); - } - return bytes; -}; - -//--------------------------------------------------------------------- -// qrcode.createStringToBytes -//--------------------------------------------------------------------- - -/** - * @param unicodeData base64 string of byte array. - * [16bit Unicode],[16bit Bytes], ... - * @param numChars - */ -qrcode.createStringToBytes = function(unicodeData, numChars) { - - // create conversion map. - - var unicodeMap = function() { - - var bin = base64DecodeInputStream(unicodeData); - var read = function() { - var b = bin.read(); - if (b == -1) throw new Error(); - return b; - }; - - var count = 0; - var unicodeMap = {}; - while (true) { - var b0 = bin.read(); - if (b0 == -1) break; - var b1 = read(); - var b2 = read(); - var b3 = read(); - var k = String.fromCharCode( (b0 << 8) | b1); - var v = (b2 << 8) | b3; - unicodeMap[k] = v; - count += 1; - } - if (count != numChars) { - throw new Error(count + ' != ' + numChars); - } - - return unicodeMap; - }(); - - var unknownChar = '?'.charCodeAt(0); - - return function(s) { - var bytes = new Array(); - for (var i = 0; i < s.length; i += 1) { - var c = s.charCodeAt(i); - if (c < 128) { - bytes.push(c); - } else { - var b = unicodeMap[s.charAt(i)]; - if (typeof b == 'number') { - if ( (b & 0xff) == b) { - // 1byte - bytes.push(b); - } else { - // 2bytes - bytes.push(b >>> 8); - bytes.push(b & 0xff); - } - } else { - bytes.push(unknownChar); - } - } - } - return bytes; - }; -}; - -//--------------------------------------------------------------------- -// QRMode -//--------------------------------------------------------------------- - -var QRMode = { - MODE_NUMBER : 1 << 0, - MODE_ALPHA_NUM : 1 << 1, - MODE_8BIT_BYTE : 1 << 2, - MODE_KANJI : 1 << 3 -}; - -//--------------------------------------------------------------------- -// QRErrorCorrectLevel -//--------------------------------------------------------------------- - -var QRErrorCorrectLevel = { - L : 1, - M : 0, - Q : 3, - H : 2 -}; - -//--------------------------------------------------------------------- -// QRMaskPattern -//--------------------------------------------------------------------- - -var QRMaskPattern = { - PATTERN000 : 0, - PATTERN001 : 1, - PATTERN010 : 2, - PATTERN011 : 3, - PATTERN100 : 4, - PATTERN101 : 5, - PATTERN110 : 6, - PATTERN111 : 7 -}; - -//--------------------------------------------------------------------- -// QRUtil -//--------------------------------------------------------------------- - -var QRUtil = function() { - - var 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] - ]; - var G15 = (1 << 10) | (1 << 8) | (1 << 5) | (1 << 4) | (1 << 2) | (1 << 1) | (1 << 0); - var G18 = (1 << 12) | (1 << 11) | (1 << 10) | (1 << 9) | (1 << 8) | (1 << 5) | (1 << 2) | (1 << 0); - var G15_MASK = (1 << 14) | (1 << 12) | (1 << 10) | (1 << 4) | (1 << 1); - - var _this = {}; - - var getBCHDigit = function(data) { - var digit = 0; - while (data != 0) { - digit += 1; - data >>>= 1; - } - return digit; - }; - - _this.getBCHTypeInfo = function(data) { - var d = data << 10; - while (getBCHDigit(d) - getBCHDigit(G15) >= 0) { - d ^= (G15 << (getBCHDigit(d) - getBCHDigit(G15) ) ); - } - return ( (data << 10) | d) ^ G15_MASK; - }; - - _this.getBCHTypeNumber = function(data) { - var d = data << 12; - while (getBCHDigit(d) - getBCHDigit(G18) >= 0) { - d ^= (G18 << (getBCHDigit(d) - getBCHDigit(G18) ) ); - } - return (data << 12) | d; - }; - - _this.getPatternPosition = function(typeNumber) { - return PATTERN_POSITION_TABLE[typeNumber - 1]; - }; - - _this.getMaskFunction = function(maskPattern) { - - switch (maskPattern) { - - case QRMaskPattern.PATTERN000 : - return function(i, j) { return (i + j) % 2 == 0; }; - case QRMaskPattern.PATTERN001 : - return function(i, j) { return i % 2 == 0; }; - case QRMaskPattern.PATTERN010 : - return function(i, j) { return j % 3 == 0; }; - case QRMaskPattern.PATTERN011 : - return function(i, j) { return (i + j) % 3 == 0; }; - case QRMaskPattern.PATTERN100 : - return function(i, j) { return (Math.floor(i / 2) + Math.floor(j / 3) ) % 2 == 0; }; - case QRMaskPattern.PATTERN101 : - return function(i, j) { return (i * j) % 2 + (i * j) % 3 == 0; }; - case QRMaskPattern.PATTERN110 : - return function(i, j) { return ( (i * j) % 2 + (i * j) % 3) % 2 == 0; }; - case QRMaskPattern.PATTERN111 : - return function(i, j) { return ( (i * j) % 3 + (i + j) % 2) % 2 == 0; }; - - default : - throw new Error('bad maskPattern:' + maskPattern); - } - }; - - _this.getErrorCorrectPolynomial = function(errorCorrectLength) { - var a = qrPolynomial([1], 0); - for (var i = 0; i < errorCorrectLength; i += 1) { - a = a.multiply(qrPolynomial([1, QRMath.gexp(i)], 0) ); - } - return a; - }; - - _this.getLengthInBits = function(mode, type) { - - if (1 <= type && type < 10) { - - // 1 - 9 - - 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) { - - // 10 - 26 - - 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) { - - // 27 - 40 - - 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); - } - }; - - _this.getLostPoint = function(qrcode) { - - var moduleCount = qrcode.getModuleCount(); - - var lostPoint = 0; - - // LEVEL1 - - for (var row = 0; row < moduleCount; row += 1) { - for (var col = 0; col < moduleCount; col += 1) { - - var sameCount = 0; - var dark = qrcode.isDark(row, col); - - for (var r = -1; r <= 1; r += 1) { - - if (row + r < 0 || moduleCount <= row + r) { - continue; - } - - for (var c = -1; c <= 1; c += 1) { - - if (col + c < 0 || moduleCount <= col + c) { - continue; - } - - if (r == 0 && c == 0) { - continue; - } - - if (dark == qrcode.isDark(row + r, col + c) ) { - sameCount += 1; - } - } - } - - if (sameCount > 5) { - lostPoint += (3 + sameCount - 5); - } - } - }; - - // LEVEL2 - - for (var row = 0; row < moduleCount - 1; row += 1) { - for (var col = 0; col < moduleCount - 1; col += 1) { - var count = 0; - if (qrcode.isDark(row, col) ) count += 1; - if (qrcode.isDark(row + 1, col) ) count += 1; - if (qrcode.isDark(row, col + 1) ) count += 1; - if (qrcode.isDark(row + 1, col + 1) ) count += 1; - if (count == 0 || count == 4) { - lostPoint += 3; - } - } - } - - // LEVEL3 - - for (var row = 0; row < moduleCount; row += 1) { - for (var col = 0; col < moduleCount - 6; col += 1) { - 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 += 1) { - for (var row = 0; row < moduleCount - 6; row += 1) { - 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; - } - } - } - - // LEVEL4 - - var darkCount = 0; - - for (var col = 0; col < moduleCount; col += 1) { - for (var row = 0; row < moduleCount; row += 1) { - if (qrcode.isDark(row, col) ) { - darkCount += 1; - } - } - } - - var ratio = Math.abs(100 * darkCount / moduleCount / moduleCount - 50) / 5; - lostPoint += ratio * 10; - - return lostPoint; - }; - - return _this; -}(); - -//--------------------------------------------------------------------- -// QRMath -//--------------------------------------------------------------------- - -var QRMath = function() { - - var EXP_TABLE = new Array(256); - var LOG_TABLE = new Array(256); - - // initialize tables - for (var i = 0; i < 8; i += 1) { - EXP_TABLE[i] = 1 << i; - } - for (var i = 8; i < 256; i += 1) { - EXP_TABLE[i] = EXP_TABLE[i - 4] - ^ EXP_TABLE[i - 5] - ^ EXP_TABLE[i - 6] - ^ EXP_TABLE[i - 8]; - } - for (var i = 0; i < 255; i += 1) { - LOG_TABLE[EXP_TABLE[i] ] = i; - } - - var _this = {}; - - _this.glog = function(n) { - - if (n < 1) { - throw new Error('glog(' + n + ')'); - } - - return LOG_TABLE[n]; - }; - - _this.gexp = function(n) { - - while (n < 0) { - n += 255; - } - - while (n >= 256) { - n -= 255; - } - - return EXP_TABLE[n]; - }; - - return _this; -}(); - -//--------------------------------------------------------------------- -// qrPolynomial -//--------------------------------------------------------------------- - -function qrPolynomial(num, shift) { - - if (typeof num.length == 'undefined') { - throw new Error(num.length + '/' + shift); - } - - var _num = function() { - var offset = 0; - while (offset < num.length && num[offset] == 0) { - offset += 1; - } - var _num = new Array(num.length - offset + shift); - for (var i = 0; i < num.length - offset; i += 1) { - _num[i] = num[i + offset]; - } - return _num; - }(); - - var _this = {}; - - _this.getAt = function(index) { - return _num[index]; - }; - - _this.getLength = function() { - return _num.length; - }; - - _this.multiply = function(e) { - - var num = new Array(_this.getLength() + e.getLength() - 1); - - for (var i = 0; i < _this.getLength(); i += 1) { - for (var j = 0; j < e.getLength(); j += 1) { - num[i + j] ^= QRMath.gexp(QRMath.glog(_this.getAt(i) ) + QRMath.glog(e.getAt(j) ) ); - } - } - - return qrPolynomial(num, 0); - }; - - _this.mod = function(e) { - - if (_this.getLength() - e.getLength() < 0) { - return _this; - } - - var ratio = QRMath.glog(_this.getAt(0) ) - QRMath.glog(e.getAt(0) ); - - var num = new Array(_this.getLength() ); - for (var i = 0; i < _this.getLength(); i += 1) { - num[i] = _this.getAt(i); - } - - for (var i = 0; i < e.getLength(); i += 1) { - num[i] ^= QRMath.gexp(QRMath.glog(e.getAt(i) ) + ratio); - } - - // recursive call - return qrPolynomial(num, 0).mod(e); - }; - - return _this; -}; - -//--------------------------------------------------------------------- -// QRRSBlock -//--------------------------------------------------------------------- - -var QRRSBlock = function() { - - - // [1: [L, M, Q, H], ..] - var 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]]; - - var qrRSBlock = function(totalCount, dataCount) { - var _this = {}; - _this.totalCount = totalCount; - _this.dataCount = dataCount; - return _this; - }; - - var _this = {}; - - var getRsBlockTable = function(typeNumber, errorCorrectLevel) { - - switch(errorCorrectLevel) { - case QRErrorCorrectLevel.L : - return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 0]; - case QRErrorCorrectLevel.M : - return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 1]; - case QRErrorCorrectLevel.Q : - return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 2]; - case QRErrorCorrectLevel.H : - return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 3]; - default : - return undefined; - } - }; - - _this.getRSBlocks = function(typeNumber, errorCorrectLevel) { - - var rsBlock = getRsBlockTable(typeNumber, errorCorrectLevel); - - if (typeof rsBlock == 'undefined') { - throw new Error('bad rs block @ typeNumber:' + typeNumber + - '/errorCorrectLevel:' + errorCorrectLevel); - } - - var length = rsBlock.length / 3; - - var list = new Array(); - - for (var i = 0; i < length; i += 1) { - - 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 += 1) { - list.push(qrRSBlock(totalCount, dataCount) ); - } - } - - return list; - }; - - return _this; -}(); - -//--------------------------------------------------------------------- -// qrBitBuffer -//--------------------------------------------------------------------- - -var qrBitBuffer = function() { - - var _buffer = new Array(); - var _length = 0; - - var _this = {}; - - _this.getBuffer = function() { - return _buffer; - }; - - _this.getAt = function(index) { - var bufIndex = Math.floor(index / 8); - return ( (_buffer[bufIndex] >>> (7 - index % 8) ) & 1) == 1; - }; - - _this.put = function(num, length) { - for (var i = 0; i < length; i += 1) { - _this.putBit( ( (num >>> (length - i - 1) ) & 1) == 1); - } - }; - - _this.getLengthInBits = function() { - return _length; - }; - - _this.putBit = function(bit) { - - var bufIndex = Math.floor(_length / 8); - if (_buffer.length <= bufIndex) { - _buffer.push(0); - } - - if (bit) { - _buffer[bufIndex] |= (0x80 >>> (_length % 8) ); - } - - _length += 1; - }; - - return _this; -}; - -//--------------------------------------------------------------------- -// qr8BitByte -//--------------------------------------------------------------------- - -var qr8BitByte = function(data) { - - var _mode = QRMode.MODE_8BIT_BYTE; - var _data = data; - var _parsedData = []; - - var _this = {}; - - - // Added to support UTF-8 Characters - for (var i = 0, l = _data.length; i < l; i++) { - var byteArray = []; - var code = _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; - } - - // Fix Unicode corruption bug - _parsedData.push(byteArray); - } - - _parsedData = Array.prototype.concat.apply([], _parsedData); - - if (_parsedData.length != _data.length) { - _parsedData.unshift(191); - _parsedData.unshift(187); - _parsedData.unshift(239); - } - - var _bytes = _parsedData; - - _this.getMode = function() { - return _mode; - }; - - _this.getLength = function(buffer) { - return _bytes.length; - }; - - _this.write = function(buffer) { - for (var i = 0; i < _bytes.length; i += 1) { - buffer.put(_bytes[i], 8); - } - }; - - return _this; -}; - -//===================================================================== -// GIF Support etc. -// - -//--------------------------------------------------------------------- -// byteArrayOutputStream -//--------------------------------------------------------------------- - -var byteArrayOutputStream = function() { - - var _bytes = new Array(); - - var _this = {}; - - _this.writeByte = function(b) { - _bytes.push(b & 0xff); - }; - - _this.writeShort = function(i) { - _this.writeByte(i); - _this.writeByte(i >>> 8); - }; - - _this.writeBytes = function(b, off, len) { - off = off || 0; - len = len || b.length; - for (var i = 0; i < len; i += 1) { - _this.writeByte(b[i + off]); - } - }; - - _this.writeString = function(s) { - for (var i = 0; i < s.length; i += 1) { - _this.writeByte(s.charCodeAt(i) ); - } - }; - - _this.toByteArray = function() { - return _bytes; - }; - - _this.toString = function() { - var s = ''; - s += '['; - for (var i = 0; i < _bytes.length; i += 1) { - if (i > 0) { - s += ','; - } - s += _bytes[i]; - } - s += ']'; - return s; - }; - - return _this; -}; - -//--------------------------------------------------------------------- -// base64EncodeOutputStream -//--------------------------------------------------------------------- - -var base64EncodeOutputStream = function() { - - var _buffer = 0; - var _buflen = 0; - var _length = 0; - var _base64 = ''; - - var _this = {}; - - var writeEncoded = function(b) { - _base64 += String.fromCharCode(encode(b & 0x3f) ); - }; - - var encode = function(n) { - if (n < 0) { - // error. - } else if (n < 26) { - return 0x41 + n; - } else if (n < 52) { - return 0x61 + (n - 26); - } else if (n < 62) { - return 0x30 + (n - 52); - } else if (n == 62) { - return 0x2b; - } else if (n == 63) { - return 0x2f; - } - throw new Error('n:' + n); - }; - - _this.writeByte = function(n) { - - _buffer = (_buffer << 8) | (n & 0xff); - _buflen += 8; - _length += 1; - - while (_buflen >= 6) { - writeEncoded(_buffer >>> (_buflen - 6) ); - _buflen -= 6; - } - }; - - _this.flush = function() { - - if (_buflen > 0) { - writeEncoded(_buffer << (6 - _buflen) ); - _buffer = 0; - _buflen = 0; - } - - if (_length % 3 != 0) { - // padding - var padlen = 3 - _length % 3; - for (var i = 0; i < padlen; i += 1) { - _base64 += '='; - } - } - }; - - _this.toString = function() { - return _base64; - }; - - return _this; -}; - -//--------------------------------------------------------------------- -// base64DecodeInputStream -//--------------------------------------------------------------------- - -var base64DecodeInputStream = function(str) { - - var _str = str; - var _pos = 0; - var _buffer = 0; - var _buflen = 0; - - var _this = {}; - - _this.read = function() { - - while (_buflen < 8) { - - if (_pos >= _str.length) { - if (_buflen == 0) { - return -1; - } - throw new Error('unexpected end of file./' + _buflen); - } - - var c = _str.charAt(_pos); - _pos += 1; - - if (c == '=') { - _buflen = 0; - return -1; - } else if (c.match(/^\s$/) ) { - // ignore if whitespace. - continue; - } - - _buffer = (_buffer << 6) | decode(c.charCodeAt(0) ); - _buflen += 6; - } - - var n = (_buffer >>> (_buflen - 8) ) & 0xff; - _buflen -= 8; - return n; - }; - - var decode = function(c) { - if (0x41 <= c && c <= 0x5a) { - return c - 0x41; - } else if (0x61 <= c && c <= 0x7a) { - return c - 0x61 + 26; - } else if (0x30 <= c && c <= 0x39) { - return c - 0x30 + 52; - } else if (c == 0x2b) { - return 62; - } else if (c == 0x2f) { - return 63; - } else { - throw new Error('c:' + c); - } - }; - - return _this; -}; - -//--------------------------------------------------------------------- -// gifImage (B/W) -//--------------------------------------------------------------------- - -var gifImage = function(width, height) { - - var _width = width; - var _height = height; - var _data = new Array(width * height); - - var _this = {}; - - _this.setPixel = function(x, y, pixel) { - _data[y * _width + x] = pixel; - }; - - _this.write = function(out) { - - //--------------------------------- - // GIF Signature - - out.writeString('GIF87a'); - - //--------------------------------- - // Screen Descriptor - - out.writeShort(_width); - out.writeShort(_height); - - out.writeByte(0x80); // 2bit - out.writeByte(0); - out.writeByte(0); - - //--------------------------------- - // Global Color Map - - // black - out.writeByte(0x00); - out.writeByte(0x00); - out.writeByte(0x00); - - // white - out.writeByte(0xff); - out.writeByte(0xff); - out.writeByte(0xff); - - //--------------------------------- - // Image Descriptor - - out.writeString(','); - out.writeShort(0); - out.writeShort(0); - out.writeShort(_width); - out.writeShort(_height); - out.writeByte(0); - - //--------------------------------- - // Local Color Map - - //--------------------------------- - // Raster Data - - var lzwMinCodeSize = 2; - var raster = getLZWRaster(lzwMinCodeSize); - - out.writeByte(lzwMinCodeSize); - - var offset = 0; - - while (raster.length - offset > 255) { - out.writeByte(255); - out.writeBytes(raster, offset, 255); - offset += 255; - } - - out.writeByte(raster.length - offset); - out.writeBytes(raster, offset, raster.length - offset); - out.writeByte(0x00); - - //--------------------------------- - // GIF Terminator - out.writeString(';'); - }; - - var bitOutputStream = function(out) { - - var _out = out; - var _bitLength = 0; - var _bitBuffer = 0; - - var _this = {}; - - _this.write = function(data, length) { - - if ( (data >>> length) != 0) { - throw new Error('length over'); - } - - while (_bitLength + length >= 8) { - _out.writeByte(0xff & ( (data << _bitLength) | _bitBuffer) ); - length -= (8 - _bitLength); - data >>>= (8 - _bitLength); - _bitBuffer = 0; - _bitLength = 0; - } - - _bitBuffer = (data << _bitLength) | _bitBuffer; - _bitLength = _bitLength + length; - }; - - _this.flush = function() { - if (_bitLength > 0) { - _out.writeByte(_bitBuffer); - } - }; - - return _this; - }; - - var getLZWRaster = function(lzwMinCodeSize) { - - var clearCode = 1 << lzwMinCodeSize; - var endCode = (1 << lzwMinCodeSize) + 1; - var bitLength = lzwMinCodeSize + 1; - - // Setup LZWTable - var table = lzwTable(); - - for (var i = 0; i < clearCode; i += 1) { - table.add(String.fromCharCode(i) ); - } - table.add(String.fromCharCode(clearCode) ); - table.add(String.fromCharCode(endCode) ); - - var byteOut = byteArrayOutputStream(); - var bitOut = bitOutputStream(byteOut); - - // clear code - bitOut.write(clearCode, bitLength); - - var dataIndex = 0; - - var s = String.fromCharCode(_data[dataIndex]); - dataIndex += 1; - - while (dataIndex < _data.length) { - - var c = String.fromCharCode(_data[dataIndex]); - dataIndex += 1; - - if (table.contains(s + c) ) { - - s = s + c; - - } else { - - bitOut.write(table.indexOf(s), bitLength); - - if (table.size() < 0xfff) { - - if (table.size() == (1 << bitLength) ) { - bitLength += 1; - } - - table.add(s + c); - } - - s = c; - } - } - - bitOut.write(table.indexOf(s), bitLength); - - // end code - bitOut.write(endCode, bitLength); - - bitOut.flush(); - - return byteOut.toByteArray(); - }; - - var lzwTable = function() { - - var _map = {}; - var _size = 0; - - var _this = {}; - - _this.add = function(key) { - if (_this.contains(key) ) { - throw new Error('dup key:' + key); - } - _map[key] = _size; - _size += 1; - }; - - _this.size = function() { - return _size; - }; - - _this.indexOf = function(key) { - return _map[key]; - }; - - _this.contains = function(key) { - return typeof _map[key] != 'undefined'; - }; - - return _this; - }; - - return _this; -}; - -var createImgTag = function(width, height, getPixel, alt) { - - var gif = gifImage(width, height); - for (var y = 0; y < height; y += 1) { - for (var x = 0; x < width; x += 1) { - gif.setPixel(x, y, getPixel(x, y) ); - } - } - - var b = byteArrayOutputStream(); - gif.write(b); - - var base64 = base64EncodeOutputStream(); - var bytes = b.toByteArray(); - for (var i = 0; i < bytes.length; i += 1) { - base64.writeByte(bytes[i]); - } - base64.flush(); - - var img = ''; - img += 'data:image/gif;base64,'; - img += base64; - - return img; -}; - -//--------------------------------------------------------------------- -// returns qrcode function. - -var drawImg = function(text, options) { - options = options || {}; - var typeNumber = options.typeNumber || 4; - var errorCorrectLevel = options.errorCorrectLevel || 'M'; - var size = options.size || 500; - - var qr; - - try { - qr = qrcode(typeNumber, errorCorrectLevel || 'M'); - qr.addData(text); - qr.make(); - } catch (e) { - if(typeNumber >= 40) { - throw new Error('Text too long to encode'); - } else { - return drawImg(text, { - size: size, - errorCorrectLevel: errorCorrectLevel, - typeNumber: typeNumber + 1 - }); - } - } - - // calc cellsize and margin - var cellsize = parseInt(size / qr.getModuleCount()); - var margin = parseInt((size - qr.getModuleCount() * cellsize) / 2); - - return qr.createImgTag(cellsize, margin, size); -}; -module.exports = { - drawImg: drawImg -}; \ No newline at end of file diff --git a/docker安装redis并设置密码.md b/docker安装redis并设置密码.md index 4b53b15..c9311d0 100644 --- a/docker安装redis并设置密码.md +++ b/docker安装redis并设置密码.md @@ -20,6 +20,6 @@ docker run --name redis -p 6380:6379 redis-test --requirepass 123456 4.查看现有的redis密码：config get requirepass -5.设置redis密码config set requirepass 123456（123456为你要设置的密码） +5.设置redis密码config set requirepass redis221024（123456为你要设置的密码） 6.若出现(error) NOAUTH Authentication required.错误，则使用 auth 密码 来认证密码 \ No newline at end of file diff --git a/教师进出校报备管理系统待确认事项.docx b/教师进出校报备管理系统待确认事项.docx new file mode 100644 index 0000000..9ce5a3f Binary files /dev/null and b/教师进出校报备管理系统待确认事项.docx differ diff --git a/界面.docx b/界面.docx new file mode 100644 index 0000000..f4ae259 Binary files /dev/null and b/界面.docx differ