浏览代码

二维码

魏超 5 年前
父节点
当前提交
1b2c3d3fda

+ 0
- 9
src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java 查看文件

10
 import com.huiju.estateagents.center.sysUser.entity.SysUser;
10
 import com.huiju.estateagents.center.sysUser.entity.SysUser;
11
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
11
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
12
 import com.huiju.estateagents.center.sysUser.service.ISysUserService;
12
 import com.huiju.estateagents.center.sysUser.service.ISysUserService;
13
-import com.huiju.estateagents.center.taUser.entity.TaUser;
14
-import com.huiju.estateagents.center.taUser.service.ITaUserService;
15
 import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
13
 import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
16
 import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
14
 import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
17
 import com.huiju.estateagents.common.CommConstant;
15
 import com.huiju.estateagents.common.CommConstant;
18
 import com.huiju.estateagents.common.JWTUtils;
16
 import com.huiju.estateagents.common.JWTUtils;
19
 import com.huiju.estateagents.common.MD5Utils;
17
 import com.huiju.estateagents.common.MD5Utils;
20
-import com.huiju.estateagents.common.StringUtils;
21
-import com.huiju.estateagents.entity.TaNewsType;
22
-import io.swagger.annotations.ApiImplicitParam;
23
-import io.swagger.annotations.ApiImplicitParams;
24
-import io.swagger.annotations.ApiOperation;
25
 import org.slf4j.Logger;
18
 import org.slf4j.Logger;
26
 import org.slf4j.LoggerFactory;
19
 import org.slf4j.LoggerFactory;
27
 import org.springframework.beans.factory.annotation.Autowired;
20
 import org.springframework.beans.factory.annotation.Autowired;
29
 
22
 
30
 import javax.servlet.http.HttpServletRequest;
23
 import javax.servlet.http.HttpServletRequest;
31
 import java.time.LocalDateTime;
24
 import java.time.LocalDateTime;
32
-import java.time.LocalTime;
33
-import java.util.Date;
34
 import java.util.HashMap;
25
 import java.util.HashMap;
35
 import java.util.Map;
26
 import java.util.Map;
36
 
27
 

+ 1
- 0
src/main/java/com/huiju/estateagents/common/CommConstant.java 查看文件

440
 	public static final Object GROUP_ACTIVITY = "groupActivity";
440
 	public static final Object GROUP_ACTIVITY = "groupActivity";
441
 	public static final String TARGET_TYPE_H5 = "H5";
441
 	public static final String TARGET_TYPE_H5 = "H5";
442
     public static final String ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/checkin/index\"}";
442
     public static final String ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/checkin/index\"}";
443
+    public static final String DRAINAGE_QRCODE = "{\"scene\":\"h5id=#0&type=#1\",\"page\":\"pages/project/h5Page\"}";
443
     
444
     
444
     /**
445
     /**
445
      * 消息通知
446
      * 消息通知

+ 2
- 2
src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java 查看文件

142
                 taMiniappQuery.eq("org_id",getOrgId(request));
142
                 taMiniappQuery.eq("org_id",getOrgId(request));
143
                 TaMiniapp taMiniapp = taMiniappMapper.selectOne(taMiniappQuery);
143
                 TaMiniapp taMiniapp = taMiniappMapper.selectOne(taMiniappQuery);
144
                 // 生成二维码
144
                 // 生成二维码
145
-                ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.ACTIVITY_QRCODE.replace("#0",taDrainage.getDrainageId().toString()).replace("#1","h5"),taMiniapp.getMiniappId());
145
+                ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.DRAINAGE_QRCODE.replace("#0",taDrainage.getDrainageId().toString()).replace("#1","h5"),taMiniapp.getMiniappId());
146
                 taDrainage.setQrCode(String.valueOf(taMiniappQrcode.getData()));
146
                 taDrainage.setQrCode(String.valueOf(taMiniappQrcode.getData()));
147
                 iTaDrainageService.updateById(taDrainage);
147
                 iTaDrainageService.updateById(taDrainage);
148
 
148
 
149
-                //添加第三方appid和secret
149
+                //添加第三方appid和secretis
150
                 TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = new TaThirdPartyMiniappConfig();
150
                 TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = new TaThirdPartyMiniappConfig();
151
                 taThirdPartyMiniappConfig.setOrgId(getOrgId(request));
151
                 taThirdPartyMiniappConfig.setOrgId(getOrgId(request));
152
                 taThirdPartyMiniappConfig.setAppid(getUUIDS());
152
                 taThirdPartyMiniappConfig.setAppid(getUUIDS());