修复代码提交数据

admin-pc/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=https://fission-star-api.hhlm1688.com/fission-star-api/
+VUE_APP_API_BASE_URL=http://localhost:8001/fission-star-api/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 

admin-pc/.env.production

@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=https://fission-star-api.hhlm1688.com/fission-star-api/
+VUE_APP_API_BASE_URL=http://localhost:8000/fission-star-api/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

module-common/pom.xml

@@ -64,6 +64,10 @@
           <artifactId>wechatpay-java</artifactId>
           <version>0.2.15</version>
       </dependency>
+      <dependency>
+          <groupId>commons-fileupload</groupId>
+          <artifactId>commons-fileupload</artifactId>
+      </dependency>
   </dependencies>
 
 </project>

module-common/src/main/java/org/jeecg/api/controller/AppletFenController.java

@@ -14,6 +14,7 @@ import org.jeecg.modules.commonVio.entity.CommonVio;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 
 @Api(tags="分享页接口")
 @RestController
@@ -26,8 +27,8 @@ public class AppletFenController {
 
     @ApiOperation(value="获取分享记录列表带分页", notes="获取分享记录列表带分页")
     @GetMapping(value = "/getSharePage")
-    public Result<?> getSharePage(@RequestHeader("X-Access-Token") String token, Integer state, PageBean pageBean) {
-        return appletFenService.getSharePage(token,state,pageBean);
+    public Result<?> getSharePage(@RequestHeader("X-Access-Token") String token, Integer state,Integer status, PageBean pageBean) {
+        return appletFenService.getSharePage(token,state,status,pageBean);
     }
 
     //获取个人分享记录详情
@@ -37,6 +38,19 @@ public class AppletFenController {
         return appletFenService.getShareInfo(token,id);
     }
 
+    //激活
+    @ApiOperation(value="激活", notes="激活")
+    @PostMapping(value = "/openVip")
+    public Result<?> openVip (@RequestHeader("X-Access-Token") String token,String code){
+        return appletFenService.openVip(token,code);
+    }
+
+    @ApiOperation(value="提现", notes="提现")
+    @PostMapping(value = "/openMoney")
+    public Result<?> openMoney (@RequestHeader("X-Access-Token") String token, BigDecimal money){
+        return appletFenService.openMoney(token,money);
+    }
+
 
     //校验个人转发是否达标
     @ApiOperation(value="校验个人转发是否达标", notes="校验个人转发是否达标")
@@ -121,8 +135,12 @@ public class AppletFenController {
         return appletFenService.saveOrUpdateVideoShare(token,commonVio);
     }
 
-
-
+    //删除分享记录
+    @ApiOperation(value="删除分享记录", notes="删除分享记录")
+    @PostMapping(value = "/deleteLog")
+    public Result<?> deleteLog(@RequestHeader("X-Access-Token") String token,Integer state,String id){
+        return appletFenService.deleteLog(token,state,id);
+    }
 
 
 

module-common/src/main/java/org/jeecg/api/controller/AppletInfoController.java

@@ -4,6 +4,7 @@ package org.jeecg.api.controller;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import net.sf.jsqlparser.statement.create.table.Index;
 import org.jeecg.api.bean.LoginReq;
 import org.jeecg.api.service.AppletInfoService;
 import org.jeecg.common.api.vo.Result;
@@ -21,6 +22,46 @@ public class AppletInfoController {
     @Resource
     private AppletInfoService appletInfoService;
 
+
+    //获取我的推广数据 - 基础数据
+    @ApiOperation(value="获取个人资料信息", notes="获取个人资料信息")
+    @GetMapping(value = "/getUserInfoVip")
+    public Result<?> getUserInfoVip(@RequestHeader("X-Access-Token") String token){
+        return appletInfoService.getUserInfoVip(token);
+    }
+
+
+
+
+
+
+
+
+
+
+    //获取我的推广数据列表
+    @ApiOperation(value="获取我的推广数据列表", notes="获取我的推广数据列表")
+    @GetMapping(value = "/getUserInfoVipList")
+    public Result<?> getUserInfoVipList(@RequestHeader("X-Access-Token") String token, Integer state,Integer role){
+        return appletInfoService.getUserInfoVipList(token);
+    }
+
+
+    //获取我的钱包数据信息 -钱包流水列表
+
+    @ApiOperation(value="获取我的钱包数据信息 -钱包流水列表", notes="获取我的钱包数据信息 -钱包流水列表")
+    @GetMapping(value = "/getWalletList")
+    public Result<?> getWalletList(@RequestHeader("X-Access-Token") String token, Integer state,String time){
+        return appletInfoService.getWalletList(token,state);
+    }
+
+
+
+
+
+
+
+
     //获取个人资料信息
     @ApiOperation(value="获取个人资料信息", notes="获取个人资料信息")
     @GetMapping(value = "/getUserInfo")
@@ -47,4 +88,6 @@ public class AppletInfoController {
 
 
 
+
+
 }

module-common/src/main/java/org/jeecg/api/controller/AppletLoginController.java

@@ -43,8 +43,8 @@ public class AppletLoginController {
     //获取基础配置信息
     @ApiOperation(value="获取基础配置信息", notes="获取基础配置信息")
     @GetMapping(value = "/getConfig")
-    public Result<Object> getConfig(){
-        return Result.OK("获取基础配置信息成功");
+    public Result<?> getConfig(){
+        return appletLoginService.getConfig();
     }
 
 
@@ -61,6 +61,14 @@ public class AppletLoginController {
     }
 
 
+    //获取新闻动态详情的接口
+    @ApiOperation(value="获取新闻动态详情的接口", notes="获取新闻动态详情的接口")
+    @GetMapping(value = "/getNewsById")
+    public Result<?> getNewsById(String id){
+        return appletLoginService.getNewsById(id);
+    }
+
+
     @ApiOperation(value="获取轮播图", notes="获取轮播图")
     @GetMapping(value = "/getBanner")
     public Result<?> getBanner(){

module-common/src/main/java/org/jeecg/api/service/AppletFenService.java

@@ -7,16 +7,25 @@ import org.jeecg.modules.commonBook.entity.CommonBook;
 import org.jeecg.modules.commonMember.entity.CommonMember;
 import org.jeecg.modules.commonTeam.entity.CommonTeam;
 import org.jeecg.modules.commonVio.entity.CommonVio;
+import org.springframework.web.bind.annotation.RequestHeader;
+
+import java.math.BigDecimal;
 
 public interface AppletFenService {
 
 
     //获取分享记录列表带分页
-    Result<?> getSharePage(String token,Integer state,PageBean pageBean);
+    Result<?> getSharePage(String token,Integer state,Integer status,PageBean pageBean);
 
     //获取个人分享记录详情
     Result<?> getShareInfo(String token,String id);
 
+    //激活
+    Result<?> openVip (String token,String code);
+
+    //提现
+    Result<?> openMoney (String token, BigDecimal money);
+
     //校验个人转发是否达标
     Result<?> checkShare(String token);
 
@@ -51,4 +60,8 @@ public interface AppletFenService {
     //增加或者修改视频分享
     Result<?> saveOrUpdateVideoShare(String token, CommonVio commonVio);
 
+
+    //删除分享记录
+    Result<?> deleteLog(String token, Integer state, String id);
+
 }

module-common/src/main/java/org/jeecg/api/service/AppletInfoService.java

@@ -4,11 +4,19 @@ package org.jeecg.api.service;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestHeader;
 
 
 public interface AppletInfoService {
 
 
+    Result<?>  getUserInfoVip(String token);
+
+
+    Result<?> getUserInfoVipList(String token);
+
+    Result<?> getWalletList(String token, Integer state);
+
     //获取个人资料信息
     Result<?> getUserInfo(String token);
 

module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java

@@ -34,6 +34,10 @@ public interface AppletLoginService {
     Result<?> getNews(PageBean pageBean);
 
 
+    //获取动态详情
+    Result<?> getNewsById(String id);
+
+
     //获取首页banner
     Result<?> getBanner();
 

module-common/src/main/java/org/jeecg/api/service/impl/AppletFenServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.api.bean.PageBean;
 import org.jeecg.api.service.AppletFenService;
 import org.jeecg.common.api.vo.Result;
@@ -23,6 +24,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
 
 @Slf4j
 @Service
@@ -43,7 +47,7 @@ public class AppletFenServiceImpl implements AppletFenService {
 
     //获取分享记录列表带分页
     @Override
-    public Result<?> getSharePage(String token,Integer state, PageBean pageBean){
+    public Result<?> getSharePage(String token,Integer state,Integer status, PageBean pageBean){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         if(state == 0){
             Page<CommonMember> page = new Page<>(pageBean.getPageNo(), pageBean.getPageSize());
@@ -53,6 +57,18 @@ public class AppletFenServiceImpl implements AppletFenService {
                     .eq(CommonMember::getUserId,hanHaiMember.getId())
                     .orderByDesc(CommonMember::getCreateTime)
                     .page(page);
+
+            if(status!=null){
+                pageList = commonMemberService
+                        .lambdaQuery()
+                        .eq(CommonMember::getUserId,hanHaiMember.getId())
+                        .eq(CommonMember::getStatus,status)
+                        .orderByDesc(CommonMember::getCreateTime)
+                        .page(page);
+            }
+
+
+
             return Result.OK("个人分享",pageList);
         }
         if(state == 1){
@@ -62,6 +78,16 @@ public class AppletFenServiceImpl implements AppletFenService {
                     .eq(CommonVio::getUserId,hanHaiMember.getId())
                     .orderByDesc(CommonVio::getCreateTime)
                     .page(page);
+
+
+
+            if(status!=null){
+                pageList = commonVioService.lambdaQuery()
+                        .eq(CommonVio::getUserId,hanHaiMember.getId())
+                        .eq(CommonVio::getStatus,status)
+                        .orderByDesc(CommonVio::getCreateTime)
+                        .page(page);
+            }
             return Result.OK("视频分享",pageList);
         }
         if(state == 2){
@@ -71,6 +97,15 @@ public class AppletFenServiceImpl implements AppletFenService {
                     .eq(CommonTeam::getUserId,hanHaiMember.getId())
                     .orderByDesc(CommonTeam::getCreateTime)
                     .page(page);
+
+
+            if(status!=null){
+                pageList = commonTeamService.lambdaQuery()
+                        .eq(CommonTeam::getUserId,hanHaiMember.getId())
+                        .eq(CommonTeam::getStatus,status)
+                        .orderByDesc(CommonTeam::getCreateTime)
+                        .page(page);
+            }
             return Result.OK("群分享",pageList);
         }
         if(state == 3){
@@ -80,6 +115,15 @@ public class AppletFenServiceImpl implements AppletFenService {
                     .eq(CommonBook::getUserId,hanHaiMember.getId())
                     .orderByDesc(CommonBook::getCreateTime)
                     .page(page);
+
+            if(status!=null){
+                pageList = commonBookService.lambdaQuery()
+                        .eq(CommonBook::getUserId,hanHaiMember.getId())
+                        .eq(CommonBook::getStatus,status)
+                        .orderByDesc(CommonBook::getCreateTime)
+                        .page(page);
+            }
+
             return Result.OK("文章分享",pageList);
         }
         return Result.error("参数错误");
@@ -93,6 +137,21 @@ public class AppletFenServiceImpl implements AppletFenService {
         return Result.OK("个人分享详情",commonMember);
     }
 
+
+    //激活
+    @Override
+    public Result<?> openVip (String token,String code){
+        return Result.OK("激活成功");
+    }
+
+    //提现
+    @Override
+    public Result<?> openMoney (String token, BigDecimal money){
+        return Result.OK("提现成功");
+    }
+
+
+
     //获取视频分享记录详情
     @Override
     public Result<?> getVideoShareInfo(String token,String id){
@@ -122,7 +181,12 @@ public class AppletFenServiceImpl implements AppletFenService {
     @Override
     public Result<?> checkShare(String token){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        return Result.OK("已转发5次",10);
+        Map<String,Object> map = new HashMap<>();
+        map.put("title","已转发5次");
+        map.put("need_num",30);
+        map.put("num",5);
+        map.put("open",false);
+        return Result.OK("查询成功",map);
     }
 
 
@@ -130,21 +194,36 @@ public class AppletFenServiceImpl implements AppletFenService {
     @Override
     public Result<?> checkVideoShare(String token){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        return Result.OK("已转发5次",10);
+        Map<String,Object> map = new HashMap<>();
+        map.put("title","已转发5次");
+        map.put("need_num",3);
+        map.put("num",15);
+        map.put("open",true);
+        return Result.OK("查询成功",map);
     }
 
     //校验群转发是否达标
     @Override
     public Result<?> checkGroupShare(String token){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        return Result.OK("已转发5次",10);
+        Map<String,Object> map = new HashMap<>();
+        map.put("title","已转发5次");
+        map.put("need_num",10);
+        map.put("num",5);
+        map.put("open",false);
+        return Result.OK("查询成功",map);
     }
 
     //校验文章转发是否达标
     @Override
     public Result<?> checkArticleShare(String token){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        return Result.OK("已转发5次",10);
+        Map<String,Object> map = new HashMap<>();
+        map.put("title","已转发5次");
+        map.put("need_num",3);
+        map.put("num",5);
+        map.put("open",true);
+        return Result.OK("查询成功",map);
     }
 
 
@@ -191,7 +270,29 @@ public class AppletFenServiceImpl implements AppletFenService {
         return Result.OK("保存成功");
     }
 
-
+    //删除分享记录
+    @Override
+    public Result<?> deleteLog(String token, Integer state, String id){
+        if(state == null){
+            return Result.error("类型不能为空");
+        }
+        if(StringUtils.isEmpty(id)){
+            return Result.error("标识不能为空");
+        }
+        if(state == 0){
+            commonMemberService.removeById(id);
+        }
+        if(state == 1){
+            commonVioService.removeById(id);
+        }
+        if(state == 2){
+            commonTeamService.removeById(id);
+        }
+        if(state == 3){
+            commonBookService.removeById(id);
+        }
+        return Result.OK("删除成功");
+    }
 
 
 

module-common/src/main/java/org/jeecg/api/service/impl/AppletInfoServiceImpl.java

@@ -5,18 +5,30 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.tomcat.util.http.fileupload.FileItem;
-import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.jeecg.api.service.AppletInfoService;
+import org.jeecg.api.wxUtils.HttpClientUtil;
+import org.jeecg.api.wxUtils.WxQrCodeVo;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.commonConfig.entity.CommonConfig;
+import org.jeecg.modules.commonConfig.service.ICommonConfigService;
+import org.jeecg.modules.commonMember.entity.CommonMember;
+import org.jeecg.modules.commonMember.service.ICommonMemberService;
+import org.jeecg.modules.commonMoney.entity.CommonMoney;
+import org.jeecg.modules.commonMoney.service.ICommonMoneyService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CommonsLogWriter;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
@@ -25,7 +37,9 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.annotation.Resource;
 import java.io.*;
+import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -36,7 +50,55 @@ public class AppletInfoServiceImpl implements AppletInfoService {
     private ShiroRealm shiroRealm;
     @Autowired
     private IHanHaiMemberService hanHaiMemberService;
+    @Autowired
+    private ICommonMoneyService commonMoneyService;
+    @Autowired
+    private ICommonConfigService commonConfigService;
+    @Value("${wechat-dm.mpAppId}")
+    private String appid;
+    @Value("${wechat-dm.mpAppSecret}")
+    private String secret;
+    @Value("${jeecg.oss.endpoint}")
+    private String endpoint;
+    @Value("${jeecg.oss.accessKey}")
+    private String accessKey;
+    @Value("${jeecg.oss.secretKey}")
+    private String secretKey;
+    @Value("${jeecg.oss.bucketName}")
+    private String bucketName;
+
+    @Override
+    public Result<?>  getUserInfoVip(String token){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        Map map = new HashMap();
+        map.put("user_sum",1000);
 
+        map.put("z_sum",900);
+        map.put("j_sum",100);
+        map.put("pidInfo",hanHaiMember);
+        map.put("money",888);
+        map.put("sum_money",888);
+        map.put("get_money",99);
+        map.put("vip_time",new Date());
+        return Result.OK(map);
+    }
+
+
+    @Override
+    public Result<?> getUserInfoVipList(String token){
+        Page<HanHaiMember> page = new Page<HanHaiMember>(1, 10);
+        IPage<HanHaiMember> pageList = hanHaiMemberService.page(page);
+        return Result.OK(pageList);
+    }
+
+
+
+    @Override
+    public Result<?> getWalletList(String token, Integer state){
+        Page<CommonMoney> page = new Page<CommonMoney>(1, 10);
+        IPage<CommonMoney> pageList = commonMoneyService.page(page);
+        return Result.OK(pageList);
+    }
 
     //获取个人资料信息
     @Override
@@ -61,189 +123,190 @@ public class AppletInfoServiceImpl implements AppletInfoService {
     //获取推广二维码
     @Override
     public Result<?> getQrCode(String token){
-//        HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-//
-//        CityConf vsion = cityConfService.lambdaQuery()
-//                .eq(CityConf::getKeyIcon, "v_sion")
-//                .one();
-//        Integer vsionStr = Integer.parseInt(vsion.getKeyValue());
-//        String trial = "release";
-//        if(vsionStr == 0){
-//            trial= "release";
-//        }else if(vsionStr == 1){
-//            trial= "trial";
-//        }else{
-//            trial= "develop";
-//        }
-//
-////        WxQrCodeVo o = (WxQrCodeVo)redisUtil.get("CodeImage::" + trial+ member.getId());
-////        if(o!=null){
-////
-////
-////            o.setName("瑶都万能墙欢迎您的加入");
-////            return Result.OK(o);
-////        }
-//
-//        Map<String, Object> param = new HashMap<>();
-//
-//        CityConf xcxSharePage = cityConfService.lambdaQuery()
-//                .eq(CityConf::getKeyIcon, "xcxSharePage")
-//                .one();
-//
-//
-//
-//
-//
-//        String key = "shareId=" + member.getId();
-//
-//        param.put("path", xcxSharePage.getKeyValue() + "?" + key); //跳转页面
-//        String accessToken = this.getAccessToken();
-//        RestTemplate rest = new RestTemplate();
-//        InputStream inputStream = null;
-//        OutputStream outputStream = null;
-//        File file = null;
-//
-////        LambdaQueryWrapper<DbConf> configImg = new LambdaQueryWrapper<>();
-////        configImg.eq(DbConf::getIsDel,0).eq(DbConf::getKeyValue,"codeImg");
-////        DbConf oneImg = confService.getOne(configImg);
-//
-//        CityConf oneImage = cityConfService.lambdaQuery()
-//                .eq(CityConf::getKeyIcon, "codeImg")
-//                .one();
-//
-//
-//
-//
-//        String codeImg = oneImage.getKeyValue();
-//        try{
-//            String url = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + accessToken;
-//            param.put("scene", member.getId());
-//            param.put("width", 150);
-//            param.put("auto_color", false);
-//            param.put("env_version", trial);
-//            Map<String, Object> line_color = new HashMap<>();
-//            line_color.put("r", 0);
-//            line_color.put("g", 0);
-//            line_color.put("b", 0);
-//            param.put("line_color", line_color);
-//            MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
-//            org.springframework.http.HttpEntity requestEntity = new org.springframework.http.HttpEntity(JSON.toJSONString(param), headers);
-//            ResponseEntity<byte[]> entity = rest.exchange(url, HttpMethod.POST, requestEntity, byte[].class, new Object[0]);
-//            byte[] result = entity.getBody();
-//
-//            inputStream = new ByteArrayInputStream(result);
-//            String tempSave = codeImg;
-//            String filePath = tempSave;
-//
-//            file = new File(filePath);
-//            if (!file.exists()) {
-//                file.createNewFile();
-//            }
-//            outputStream = new FileOutputStream(file);
-//            int len = 0;
-//            byte[] buf = new byte[1024];
-//            while ((len = inputStream.read(buf, 0, 1024)) != -1) {
-//                outputStream.write(buf, 0, len);
-//            }
-//            outputStream.flush();
-//            /**
-//             * 将文件上传至阿里云
-//             */
-//            DiskFileItemFactory factory = new DiskFileItemFactory(16, null);
-//            FileItem item = factory.createItem("File", "text/plain", true, file.getName());
-//            int bytesRead = 0;
-//            byte[] buffer = new byte[8192];
-//            try {
-//                FileInputStream fis = new FileInputStream(file);
-//                OutputStream os = item.getOutputStream();
-//                while ((bytesRead = fis.read(buffer, 0, 8192)) != -1) {
-//                    os.write(buffer, 0, bytesRead);
-//                }
-//                os.close();
-//                fis.close();
-//            } catch (IOException e) {
-//                e.printStackTrace();
-//            }
-//            MultipartFile mf = new CommonsMultipartFile(item);
-//            //返回图片下载地址
-//            WxQrCodeVo wxCodeVo = new WxQrCodeVo();
-//            wxCodeVo.setUrl(this.uploadAliYunOss(mf));
-//
-//
-//
-//
-//            wxCodeVo.setName("瑶都万能墙欢迎您的加入");
-//
-////            redisUtil.set("CodeImage::"+trial+member.getId(),wxCodeVo);
-//            return Result.OK(wxCodeVo);
+        HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        CommonConfig vsion = commonConfigService.lambdaQuery()
+                .eq(CommonConfig::getKeyName, "v_sion")
+                .one();
+
+        Integer vsionStr = Integer.parseInt(vsion.getKeyContent());
+        String trial = "release";
+        if(vsionStr == 0){
+            trial= "release";
+        }else if(vsionStr == 1){
+            trial= "trial";
+        }else{
+            trial= "develop";
+        }
+
+//        WxQrCodeVo o = (WxQrCodeVo)redisUtil.get("CodeImage::" + trial+ member.getId());
+//        if(o!=null){
 //
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        } finally {
 //
-//            if (inputStream != null) {
-//                try {
-//                    inputStream.close();
-//                } catch (IOException e) {
-//                    e.printStackTrace();
-//                }
-//            }
-//            if (outputStream != null) {
-//                try {
-//                    outputStream.close();
-//                } catch (IOException e) {
-//                    e.printStackTrace();
-//                }
-//            }
-//            //删除文件
-//            if (file.exists()) {
-//                file.delete();
-//            }
+//            o.setName("瑶都万能墙欢迎您的加入");
+//            return Result.OK(o);
 //        }
-//        return null;
+
+        Map<String, Object> param = new HashMap<>();
+
+
+        CommonConfig xcxSharePage = commonConfigService.lambdaQuery()
+                .eq(CommonConfig::getKeyName, "xcxSharePage")
+                .one();
+
+
+
+
+
+        String key = "shareId=" + member.getId();
+
+        param.put("path", xcxSharePage.getKeyContent() + "?" + key); //跳转页面
+        String accessToken = this.getAccessToken();
+        RestTemplate rest = new RestTemplate();
+        InputStream inputStream = null;
+        OutputStream outputStream = null;
+        File file = null;
+
+//        LambdaQueryWrapper<DbConf> configImg = new LambdaQueryWrapper<>();
+//        configImg.eq(DbConf::getIsDel,0).eq(DbConf::getKeyValue,"codeImg");
+//        DbConf oneImg = confService.getOne(configImg);
+
+
+        CommonConfig oneImage = commonConfigService.lambdaQuery()
+                .eq(CommonConfig::getKeyName, "codeImg")
+                .one();
+
+
+
+        String codeImg = oneImage.getKeyValue();
+        try{
+            String url = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + accessToken;
+            param.put("scene", member.getId());
+            param.put("width", 150);
+            param.put("auto_color", false);
+            param.put("env_version", trial);
+            Map<String, Object> line_color = new HashMap<>();
+            line_color.put("r", 0);
+            line_color.put("g", 0);
+            line_color.put("b", 0);
+            param.put("line_color", line_color);
+            MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
+            org.springframework.http.HttpEntity requestEntity = new org.springframework.http.HttpEntity(JSON.toJSONString(param), headers);
+            ResponseEntity<byte[]> entity = rest.exchange(url, HttpMethod.POST, requestEntity, byte[].class, new Object[0]);
+            byte[] result = entity.getBody();
+
+            inputStream = new ByteArrayInputStream(result);
+            String tempSave = codeImg;
+            String filePath = tempSave;
+
+            file = new File(filePath);
+            if (!file.exists()) {
+                file.createNewFile();
+            }
+            outputStream = new FileOutputStream(file);
+            int len = 0;
+            byte[] buf = new byte[1024];
+            while ((len = inputStream.read(buf, 0, 1024)) != -1) {
+                outputStream.write(buf, 0, len);
+            }
+            outputStream.flush();
+            /**
+             * 将文件上传至阿里云
+             */
+            DiskFileItemFactory factory = new DiskFileItemFactory(16, null);
+            FileItem item = factory.createItem("File", "text/plain", true, file.getName());
+            int bytesRead = 0;
+            byte[] buffer = new byte[8192];
+            try {
+                FileInputStream fis = new FileInputStream(file);
+                OutputStream os = item.getOutputStream();
+                while ((bytesRead = fis.read(buffer, 0, 8192)) != -1) {
+                    os.write(buffer, 0, bytesRead);
+                }
+                os.close();
+                fis.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            MultipartFile mf = new CommonsMultipartFile(item);
+            //返回图片下载地址
+            WxQrCodeVo wxCodeVo = new WxQrCodeVo();
+            wxCodeVo.setUrl(this.uploadAliYunOss(mf));
+
+
+
+
+            wxCodeVo.setName("欢迎您的加入");
+
+//            redisUtil.set("CodeImage::"+trial+member.getId(),wxCodeVo);
+            return Result.OK(wxCodeVo);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+
+            if (inputStream != null) {
+                try {
+                    inputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (outputStream != null) {
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            //删除文件
+            if (file.exists()) {
+                file.delete();
+            }
+        }
         return null;
     }
 
 
-//    /**
-//     * 获取令牌
-//     *
-//     * @return
-//     */
-//    private String getAccessToken() {
-//        String requestUrl = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appid + "&secret=" + secret;
-//        String doGet2 = HttpClientUtil.doGet2(requestUrl);
-//        Map<String, String> map = JSON.parseObject(doGet2, new TypeReference<Map<String, String>>() {
-//        });
-//        return map.get("access_token");
-//    }
-//    /**
-//     * 上传文件至阿里云oss
-//     *
-//     * @return
-//     */
-//    private String uploadAliYunOss(MultipartFile mf) throws Exception {
-//        String uploadFile = "WxCodeFile";
-//        String fileName = new StringBuffer(mf.getOriginalFilename()).append(".jpg").toString();// 获取文件名
-//        String dbpath = uploadFile + File.separator + fileName;
-//        if (dbpath.contains("\\")) {
-//            dbpath = dbpath.replace("\\", "/");
-//        }
-//        String endpoint = this.endpoint;
-//        String accessKey = this.accessKey;
-//        String secretKey = this.secretKey;
-//        // 创建OSSClient实例。
-//        OSS ossClient = new OSSClientBuilder().build(endpoint, accessKey, secretKey);
-//        // 上传Byte数组。
-//        byte[] content = mf.getBytes();
-//        String bucketName = this.bucketName;
-//        ossClient.putObject(bucketName, dbpath, new ByteArrayInputStream(content));
-//        // 关闭OSSClient。
-//        ossClient.shutdown();
-//        return dbpath;
-//    }
-//
-//
+    /**
+     * 获取令牌
+     *
+     * @return
+     */
+    private String getAccessToken() {
+        String requestUrl = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appid + "&secret=" + secret;
+        String doGet2 = HttpClientUtil.doGet2(requestUrl);
+        Map<String, String> map = JSON.parseObject(doGet2, new TypeReference<Map<String, String>>() {
+        });
+        return map.get("access_token");
+    }
+    /**
+     * 上传文件至阿里云oss
+     *
+     * @return
+     */
+    private String uploadAliYunOss(MultipartFile mf) throws Exception {
+        String uploadFile = "WxCodeFile";
+        String fileName = new StringBuffer(mf.getOriginalFilename()).append(".jpg").toString();// 获取文件名
+        String dbpath = uploadFile + File.separator + fileName;
+        if (dbpath.contains("\\")) {
+            dbpath = dbpath.replace("\\", "/");
+        }
+        String endpoint = this.endpoint;
+        String accessKey = this.accessKey;
+        String secretKey = this.secretKey;
+        // 创建OSSClient实例。
+        OSS ossClient = new OSSClientBuilder().build(endpoint, accessKey, secretKey);
+        // 上传Byte数组。
+        byte[] content = mf.getBytes();
+        String bucketName = this.bucketName;
+        ossClient.putObject(bucketName, dbpath, new ByteArrayInputStream(content));
+        // 关闭OSSClient。
+        ossClient.shutdown();
+        return dbpath;
+    }
+
+
 
 
 

module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java

@@ -221,6 +221,14 @@ public class AppletLoginServiceImpl implements AppletLoginService {
     }
 
 
+    //获取动态详情
+    @Override
+    public Result<?> getNewsById(String id){
+        CommonNews byId = commonNewsService.getById(id);
+        return Result.OK("动态详情",byId);
+    }
+
+
     //获取首页banner
     @Override
     public Result<?> getBanner(){

module-common/src/main/java/org/jeecg/api/wxUtils/WxQrCodeVo.java

@@ -0,0 +1,18 @@
+package org.jeecg.api.wxUtils;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class WxQrCodeVo {
+    /**图片地址*/
+    @ApiModelProperty(value = "图片地址")
+    private String url;
+
+    @ApiModelProperty(value = "二维码名称")
+    private String name;
+
+    @ApiModelProperty(value = "二维码背景图")
+    private String bjImage;
+
+}

module-common/src/main/java/org/jeecg/modules/commonConfig/controller/CommonConfigController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 公共配置表
  * @Author: jeecg-boot
- * @Date:   2025-03-22
+ * @Date:   2025-03-27
  * @Version: V1.0
  */
 @Api(tags="公共配置表")

module-common/src/main/java/org/jeecg/modules/commonConfig/entity/CommonConfig.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 公共配置表
  * @Author: jeecg-boot
- * @Date:   2025-03-22
+ * @Date:   2025-03-27
  * @Version: V1.0
  */
 @Data

module-common/src/main/java/org/jeecg/modules/commonConfig/mapper/CommonConfigMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 公共配置表
  * @Author: jeecg-boot
- * @Date:   2025-03-22
+ * @Date:   2025-03-27
  * @Version: V1.0
  */
 public interface CommonConfigMapper extends BaseMapper<CommonConfig> {

module-common/src/main/java/org/jeecg/modules/commonConfig/service/ICommonConfigService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 公共配置表
  * @Author: jeecg-boot
- * @Date:   2025-03-22
+ * @Date:   2025-03-27
  * @Version: V1.0
  */
 public interface ICommonConfigService extends IService<CommonConfig> {

module-common/src/main/java/org/jeecg/modules/commonConfig/service/impl/CommonConfigServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 公共配置表
  * @Author: jeecg-boot
- * @Date:   2025-03-22
+ * @Date:   2025-03-27
  * @Version: V1.0
  */
 @Service

module-common/src/main/java/org/jeecg/modules/commonMoney/controller/CommonMoneyController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 提现流水
  * @Author: jeecg-boot
- * @Date:   2025-03-22
+ * @Date:   2025-03-27
  * @Version: V1.0
  */
 @Api(tags="提现流水")

module-common/src/main/java/org/jeecg/modules/commonMoney/entity/CommonMoney.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 提现流水
  * @Author: jeecg-boot
- * @Date:   2025-03-22
+ * @Date:   2025-03-27
  * @Version: V1.0
  */
 @Data
@@ -63,4 +63,8 @@ public class CommonMoney implements Serializable {
 	@Excel(name = "当前余额", width = 15)
     @ApiModelProperty(value = "当前余额")
     private java.math.BigDecimal money;
+	/**标题*/
+	@Excel(name = "标题", width = 15)
+    @ApiModelProperty(value = "标题")
+    private java.lang.String title;
 }

module-common/src/main/java/org/jeecg/modules/commonMoney/mapper/CommonMoneyMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 提现流水
  * @Author: jeecg-boot
- * @Date:   2025-03-22
+ * @Date:   2025-03-27
  * @Version: V1.0
  */
 public interface CommonMoneyMapper extends BaseMapper<CommonMoney> {

module-common/src/main/java/org/jeecg/modules/commonMoney/service/ICommonMoneyService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 提现流水
  * @Author: jeecg-boot
- * @Date:   2025-03-22
+ * @Date:   2025-03-27
  * @Version: V1.0
  */
 public interface ICommonMoneyService extends IService<CommonMoney> {

module-common/src/main/java/org/jeecg/modules/commonMoney/service/impl/CommonMoneyServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 提现流水
  * @Author: jeecg-boot
- * @Date:   2025-03-22
+ * @Date:   2025-03-27
  * @Version: V1.0
  */
 @Service

module-common/src/main/java/org/jeecg/modules/commonMoney/vue/CommonMoneyList.vue

@@ -141,6 +141,11 @@
             align:"center",
             dataIndex: 'money'
           },
+          {
+            title:'标题',
+            align:"center",
+            dataIndex: 'title'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -179,6 +184,7 @@
         fieldList.push({type:'string',value:'status',text:'提现状态',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'price',text:'提现金额',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'money',text:'当前余额',dictCode:''})
+        fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
         this.superFieldList = fieldList
       }
     }

module-common/src/main/java/org/jeecg/modules/commonMoney/vue/modules/CommonMoneyForm.vue

@@ -23,6 +23,11 @@
               <a-input-number v-model="model.money" placeholder="请输入当前余额" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
+              <a-input v-model="model.title" placeholder="请输入标题"  ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

module-common/src/main/java/org/jeecg/modules/commonMoney/vue3/CommonMoney.data.ts

@@ -24,6 +24,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'money'
    },
+   {
+    title: '标题',
+    align:"center",
+    dataIndex: 'title'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -50,4 +55,9 @@ export const formSchema: FormSchema[] = [
     field: 'money',
     component: 'InputNumber',
   },
+  {
+    label: '标题',
+    field: 'title',
+    component: 'Input',
+  },
 ];

module-common/src/main/java/org/jeecg/modules/commonVio/entity/CommonVio.java

@@ -89,4 +89,9 @@ public class CommonVio implements Serializable {
 	@Excel(name = "视频", width = 15)
     @ApiModelProperty(value = "视频")
     private java.lang.String vio;
+
+    /**广告弹出时间*/
+    @Excel(name = "广告弹出时间", width = 15)
+    @ApiModelProperty(value = "广告弹出时间")
+    private java.lang.Integer timeNum;
 }

module-system/pom.xml

@@ -45,7 +45,17 @@
 			<artifactId>jimureport-spring-boot-starter</artifactId>
 			<version>1.5.0-beta</version>
 		</dependency>
-
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>1.4</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>commons-io</artifactId>
+					<groupId>commons-io</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>