czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

注册相关,查询用户详情,后台切换通道相关

Browse Source
This commit is contained in:
liuyingfang
2023-07-04 10:51:41 +08:00
parent b426dfa12e
commit 5beafd2970
10 changed files with 91 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pluss-api-page/src/main/java/cn/pluss/platform/controller/IntroduceController.java
View File

@@ -27,8 +27,7 @@ public class IntroduceController {
private AppGuideService appGuideService;
@GetMapping({"/common", "/common/{code}"})
public Result<String> billIntro(@PathVariable(value = "code", required = false) String code, HttpServletRequest httpServletRequest,
@RequestParam String typeCode) {
public Result<String> billIntro(@PathVariable(value = "code", required = false) String code, HttpServletRequest httpServletRequest) {
if (StringUtils.isEmpty(code)) {
String html = "<p><img src=\"https://www.shouyinbei.net/resources/images/upload/82031620725808697.jpg\" style=\"\"/></p><p><img src=\"https://www.shouyinbei.net/resources/images/upload/86751620725811158.jpg\" style=\"\"/></p><p><img src=\"https://www.shouyinbei.net/resources/images/upload/38401620725814105.jpg\" style=\"\"/></p><p><img src=\"https://www.shouyinbei.net/resources/images/upload/14561620725816223.jpg\" style=\"\"/></p><p><img src=\"https://www.shouyinbei.net/resources/images/upload/45071620725822267.jpg\" style=\"\"/></p><p><img src=\"https://www.shouyinbei.net/resources/images/upload/31221620725827105.jpg\" style=\"\"/></p><p><img src=\"https://www.shouyinbei.net/resources/images/upload/68211620725829889.jpg\" style=\"\"/></p><p><br/></p>";
return ResultGenerator.genSuccessResult(html);
@@ -43,7 +42,7 @@ public class IntroduceController {
String type = httpServletRequest.getHeader("type");
//TODO 暂时安卓开发IOS不开
if ("1".equals(type)){
return ResultGenerator.genSuccessResult(image(typeCode));
return ResultGenerator.genSuccessResult(entity.getContent());
}else if ("2".equals(type)){
return ResultGenerator.genFailResult("");
}

9
pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java
View File

@@ -382,7 +382,14 @@ public class UserAppController {
QueryWrapper<UserPromotion> QueryWrapper = new QueryWrapper<>();
QueryWrapper.eq("user_id", result.getUserId());
UserPromotion userPromotion = userPromotionService.getOne(QueryWrapper);
result.setTypeCode(userPromotion==null?"null":userPromotion.getTypeCode());
result.setTypeCode(userPromotion == null?"null":userPromotion.getTypeCode());
result.setMinFee(userPromotion == null?"null":userPromotion.getCurrentFee());
QueryWrapper.clear();
QueryWrapper.eq("user_id","244");
userPromotion = userPromotionService.getOne(QueryWrapper);
result.setMaxFee(userPromotion == null?"null":userPromotion.getCurrentFee());
return ResultGenerator.genSuccessResult(result);
}

23
pluss-api-page/src/main/resources/application-dev.yml
View File

@@ -1,14 +1,19 @@
spring:
# datasource:
# url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
# username: root
# password: CZGmysqlroot@123
# driver-class-name: com.mysql.jdbc.Driver
datasource:
url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
username: root
password: prodCZGmysqlroot@123
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
username: root
password: CZGmysqlroot@123
driver-class-name: com.mysql.jdbc.Driver
# datasource:
# url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
# username: root
# password: prodCZGmysqlroot@123
# driver-class-name: com.mysql.jdbc.Driver
# datasource:
# url: jdbc:mysql://60.205.224.68:3306/ysk_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
# username: root
# password: CZGmysqlroot@123
# driver-class-name: com.mysql.jdbc.Driver
parameter:
### 这个根据自己的情况配置
domain: https://ky.sxczgkj.cn

2
pluss-api-page/src/main/resources/application.yml
View File

@@ -5,7 +5,7 @@ spring:
profiles:
### 将一些固定的配置放到下级文件夹下的yml文件中
include: common, ryx, ys
active: prod
active: dev
mvc:
view:
prefix: /WEB-INF/jsp/