|
@@ -204,14 +204,14 @@ public class LoginService {
|
|
|
|
|
|
|
|
public JSONObject createLoginQrCode() throws Exception {
|
|
public JSONObject createLoginQrCode() throws Exception {
|
|
|
String uuid = "4dkankan_"+NumberUtils.getUUID();
|
|
String uuid = "4dkankan_"+NumberUtils.getUUID();
|
|
|
- String filePath = QrCodeFilePath.LOGIN_QR_CODE_PATH + uuid + ".png";
|
|
|
|
|
- File file = new File(QrCodeFilePath.LOGO_IMAGE_LOCAL);
|
|
|
|
|
- if(!file.exists()){
|
|
|
|
|
- fYunFileServiceInterface.downloadFile(QrCodeFilePath.LOGO_IMAGE_OSS,QrCodeFilePath.LOGO_IMAGE_LOCAL);
|
|
|
|
|
- }
|
|
|
|
|
- MatrixToImageWriterUtil.createQRCode(NacosProperty.getMainUrl() + "app/index.html?m="+uuid, filePath,true,QrCodeFilePath.LOGO_IMAGE_LOCAL);
|
|
|
|
|
|
|
+// String filePath = QrCodeFilePath.LOGIN_QR_CODE_PATH + uuid + ".png";
|
|
|
|
|
+// File file = new File(QrCodeFilePath.LOGO_IMAGE_LOCAL);
|
|
|
|
|
+// if(!file.exists()){
|
|
|
|
|
+// fYunFileServiceInterface.downloadFile(QrCodeFilePath.LOGO_IMAGE_OSS,QrCodeFilePath.LOGO_IMAGE_LOCAL);
|
|
|
|
|
+// }
|
|
|
|
|
+ //MatrixToImageWriterUtil.createQRCode(NacosProperty.getMainUrl() + "app/index.html?m="+uuid, filePath,true,QrCodeFilePath.LOGO_IMAGE_LOCAL);
|
|
|
JSONObject json = new JSONObject();
|
|
JSONObject json = new JSONObject();
|
|
|
- json.put("url", filePath.replace(ConstantFilePath.BASE_PATH, ""));
|
|
|
|
|
|
|
+ // json.put("url", filePath.replace(ConstantFilePath.BASE_PATH, ""));
|
|
|
json.put("uuid", uuid);
|
|
json.put("uuid", uuid);
|
|
|
redisUtil.set(RedisKeyUtil.QRCODE+uuid,uuid,5*60);
|
|
redisUtil.set(RedisKeyUtil.QRCODE+uuid,uuid,5*60);
|
|
|
return json;
|
|
return json;
|