java/jiashida.git

			@@ -8,6 +8,7 @@
			import cn.hutool.core.util.RandomUtil;
			import cn.hutool.crypto.SecureUtil;
			import cn.hutool.http.HttpRequest;
			import cn.hutool.http.HttpResponse;
			import cn.hutool.http.HttpUtil;
			import com.alibaba.fastjson.JSON;
			import com.alibaba.fastjson.JSONObject;
			@@ -199,7 +200,7 @@
			@GetMapping(value = "/getQrcode")
			public R<String> getQrcode(@RequestParam Long userId) {
			SysUser sysUser = userService.selectUserById(userId);
			Object o = redisTemplate.opsForValue().get("ADMIN_WX_IMG" + sysUser.getCode());
			Object o = redisTemplate.opsForValue().get("ADMIN_WX_IMG" + sysUser.getUserId());
			if(o!=null){
			return R.ok(o.toString());
			}
			@@ -208,12 +209,13 @@
			Map<String, Object> param = new HashMap<>();
			param.put("page", "pages/home/home");
			param.put("width", 430); //二维码尺寸
			param.put("scene", "userId=" + userId); //二维码尺寸
			param.put("scene", "code=" + sysUser.getCode()+"&type=1"); //二维码尺寸
			param.put("env_version", "trial"); //二维码尺寸
			param.put("check_path", false); //二维码尺寸
			HttpRequest post = HttpUtil.createPost(url);
			post.body(JSON.toJSONString(param));

			byte[] result = post.execute().bodyBytes();
			HttpResponse execute = post.execute();
			byte[] result =execute .bodyBytes();
			// base64
			String img = Base64.getEncoder().encodeToString(result);
			// 后台用户的小程序码

			@@ -132,7 +132,7 @@
			@TableField("promotion_qr_code")
			private String promotionQrCode;

			@ApiModelProperty(value = "角色类型（1=平台账号，2=经销商账号）")
			@ApiModelProperty(value = "角色类型（1=平台账号，2=经销商账号（超管） 3股东）")
			@TableField("role_type")
			private Integer roleType;

			@@ -132,7 +132,7 @@
			<select id="selectUserById" parameterType="Long" resultType="com.ruoyi.common.core.domain.entity.SysUser">
			select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
			u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
			u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,
			u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.code,
			ur.role_id AS roleId,sr.role_name AS roleName
			from sys_user u
			left join sys_user_role ur on u.user_id = ur.user_id

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史