Merge branch 'homework' into dev

src/main/java/io/renren/modules/app/controller/QRCodeTest.java

@@ -20,7 +20,7 @@ import java.awt.image.BufferedImage;
import java.io.IOException;
/**
 * APP测试接口
 * 二维码测试接口
 *
 * @author Mark sunlightcs@gmail.com
 */
@@ -51,4 +51,15 @@ public class QRCodeTest {
		}
    }
	@GetMapping("qcodetesturl")
    @ApiOperation("获取二维码图片地址")
    public void  getCodeImgUrl(String text)throws IOException {
		String img = (new Date().getTime()).toString();
		try{
			qRCodeUtils.encode(text, img);
			return R.ok().put("img", img);
		}catch(Exception e){
			e.printStackTrace();
		}
    }
}