Merge branch 'test' into dev-lqc

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashOasBoxController.java

@@ -51,5 +51,7 @@ public class FosterwxCashOasBoxController extends BaseController<FosterwxCashOas
     }
 
 
+
+
 }
 

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashTaskListController.java

@@ -3,6 +3,7 @@ package com.mokamrp.privates.controller.pangu;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mokamrp.privates.constant.Constants;
 import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.entity.AddHandle;
 import com.mokamrp.privates.entity.DelHandle;
 import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.help.AjaxResult;

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashTaskTemplateController.java

@@ -3,6 +3,7 @@ package com.mokamrp.privates.controller.pangu;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mokamrp.privates.constant.Constants;
 import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.entity.AddHandle;
 import com.mokamrp.privates.entity.DelHandle;
 import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.help.AjaxResult;
@@ -77,6 +78,27 @@ public class FosterwxCashTaskTemplateController extends BaseController<FosterwxC
         return AjaxResult.success(res);
     }
 
+    @PostMapping("/add")
+    public Object add(@Valid @RequestBody AddHandle<FosterwxCashTaskTemplate> addHandle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        this.onInsert(addHandle.getRaw());
+        FosterwxCashTaskTemplate add = addHandle.getRaw();
+        Boolean res = service.save(add);
+        for (FosterwxCashTaskList fosterwxCashTaskList : add.getTaskList()){
+            fosterwxCashTaskList.setTemplateId(add.getId());
+            fosterwxCashTaskList.setCreateAt(LocalDateTime.now());
+            fosterwxCashTaskList.setUpdateAt(LocalDateTime.now());
+            fosterwxCashTaskListService.save(fosterwxCashTaskList);
+        }
+        if (res) {
+            return AjaxResult.success(Constants.SUCCESS, res);
+        } else {
+            return AjaxResult.error("新增失败", res);
+        }
+    }
+
     /**
      * 软删除
      * @param delHandle

src/main/java/com/mokamrp/privates/controller/pangu/PromoteCodeController.java

@@ -16,6 +16,7 @@ import com.mokamrp.privates.interceptor.AuthUser;
 import com.mokamrp.privates.mapper.pangu.pojo.PromoteQrcodePool;
 import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.service.pangu.PromoteQrcodePoolService;
+import com.mokamrp.privates.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.validation.BindingResult;

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/PromoteCode.java

@@ -26,7 +26,7 @@ public class PromoteCode extends Model<PromoteCode> {
     /**
      * id
      */
-      @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
     private Integer promoteType;
 
@@ -172,16 +172,16 @@ public class PromoteCode extends Model<PromoteCode> {
     @Override
     public String toString() {
         return "PromoteCode{" +
-        "id=" + id +
-        ", name=" + name +
-        ", status=" + status +
-        ", domainId=" + domainId +
-        ", takeQrcodePv=" + takeQrcodePv +
-        ", longTouchPv=" + longTouchPv +
-        ", dayUvMax=" + dayUvMax +
-        ", hourUvMax=" + hourUvMax +
-        ", createAt=" + createAt +
-        ", updateAt=" + updateAt +
-        "}";
+                "id=" + id +
+                ", name=" + name +
+                ", status=" + status +
+                ", domainId=" + domainId +
+                ", takeQrcodePv=" + takeQrcodePv +
+                ", longTouchPv=" + longTouchPv +
+                ", dayUvMax=" + dayUvMax +
+                ", hourUvMax=" + hourUvMax +
+                ", createAt=" + createAt +
+                ", updateAt=" + updateAt +
+                "}";
     }
 }

src/main/java/com/mokamrp/privates/service/pangu/FosterwxCashOasBoxService.java

@@ -17,4 +17,8 @@ import java.util.Map;
 public interface FosterwxCashOasBoxService extends IService<FosterwxCashOasBox> {
     //.@leon 获取数据列表
     public ResHandle<List<FosterwxCashOasBox>> getList(PostBasePageHandle handle);
+    //.@leon 获取一个正常状态的小程序
+    public FosterwxCashOasBox getRandBox();
+    //.@leon 获取一个正常状态的公众号
+    public FosterwxCashOasBox getRandOas();
 }

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashOasBoxServiceImpl.java

@@ -1,15 +1,18 @@
 package com.mokamrp.privates.service.pangu.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashOasBox;
 import com.mokamrp.privates.mapper.pangu.FosterwxCashOasBoxMapper;
 import com.mokamrp.privates.service.pangu.FosterwxCashOasBoxService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mokamrp.privates.utils.StringUtils;
 import org.springframework.stereotype.Service;
 import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import com.mokamrp.privates.entity.ResHandle;
+
 import java.util.*;
 
 /**
@@ -25,8 +28,10 @@ public class FosterwxCashOasBoxServiceImpl extends ServiceImpl<FosterwxCashOasBo
 
     @Autowired
     public FosterwxCashOasBoxMapper fosterwxCashOasBoxMapper;
+
     /**
      * 获取数据列表 支持分页
+     *
      * @param handle
      * @return
      */
@@ -40,4 +45,40 @@ public class FosterwxCashOasBoxServiceImpl extends ServiceImpl<FosterwxCashOasBo
         res.setTotal(pageObj.getTotal());
         return res;
     }
+
+    /**
+     * 获取一个有效的小程序
+     * @return
+     */
+    public FosterwxCashOasBox getRandBox() {
+        List<FosterwxCashOasBox> list = this.list(new QueryWrapper<FosterwxCashOasBox>()
+                .eq("type", 1)
+                .eq("fobidden_status",1));
+        if (list == null || list.size() <= 0) {
+            return null;
+        }
+        int max = list.size()-1;
+        int min = 0;
+        Random random = new Random();
+        int i = random.nextInt(max) % (max - min + 1) + min;
+        return list.get(i);
+    }
+
+    /**
+     * 获取一个有效的公众号
+     * @return
+     */
+    public FosterwxCashOasBox getRandOas() {
+        List<FosterwxCashOasBox> list = this.list(new QueryWrapper<FosterwxCashOasBox>()
+                .eq("type", 2)
+                .eq("fobidden_status",1));
+        if (list == null || list.size() <= 0) {
+            return null;
+        }
+        int max = list.size()-1;
+        int min = 0;
+        Random random = new Random();
+        int i = random.nextInt(max) % (max - min + 1) + min;
+        return list.get(i);
+    }
 }

src/main/java/com/mokamrp/privates/service/pangu/impl/PromoteCodeServiceImpl.java

@@ -10,10 +10,13 @@ import com.mokamrp.privates.service.pangu.DomainFirstService;
 import com.mokamrp.privates.service.pangu.DomainSecondService;
 import com.mokamrp.privates.service.pangu.PromoteCodeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mokamrp.privates.utils.sign.Aes;
+import org.apache.commons.codec.binary.Base64;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -46,7 +49,15 @@ public class PromoteCodeServiceImpl extends ServiceImpl<PromoteCodeMapper, Promo
         List<PromoteCodeVo> list = promoteCodeMapper.getlist(page,promoteCodeListHandle,deptId);
         Map<String,Object> res = new HashMap<>();
         for (PromoteCodeVo promoteCodeVo : list){
-            promoteCodeVo.setQrcode(promoteCodeVo.getId()+"/#/dispatch?promoteId=");
+            Integer promoteId = promoteCodeVo.getId();
+            String promoteIdAes;
+            try{
+                promoteIdAes = Aes.encryptAES(promoteId.toString());
+                promoteIdAes = Aes.enAna(promoteIdAes);
+            }catch (Exception e){
+                promoteIdAes = promoteId.toString();
+            }
+            promoteCodeVo.setQrcode(promoteCodeVo.getDomain()+"/#/dispatch?promoteId="+promoteIdAes);
         }
         res.put("list",list);
         res.put("total",page.getTotal());

src/main/java/com/mokamrp/privates/utils/sign/Aes.java

@@ -87,4 +87,18 @@ public class Aes {
     public static byte[] decode(String base64EncodedString) {
         return new Base64().decode(base64EncodedString);
     }
+
+    public static String enAna(String text){
+        text = text.replaceAll("\\+","_volta_1_");
+        text = text.replaceAll("/","_volta_2_");
+        text = text.replaceAll("=","_volta_3_");
+        return text;
+    }
+
+    public static String deAna(String text){
+        text = text.replaceAll("_volta_1_","+");
+        text = text.replaceAll("_volta_2_","/");
+        text = text.replaceAll("_volta_3_","=");
+        return text;
+    }
 }

src/main/resources/application-test.properties

@@ -70,6 +70,7 @@ xxl-sso.excluded.paths=/healthy,\
 #xxl.sso.redis.address=redis://xxl-sso:Jch9shshl@r-uf633f3f27aa2174pd.redis.rds.aliyuncs.com:6379/0
 xxl.sso.redis.address=redis://xxl-sso:MokaSapce666$%25_RediS@r-uf6727zrr24ioihy72pd.redis.rds.aliyuncs.com:23563/0
 menu.host=http://space-server-in-svc/space/menu/getMenuInterface?sysCode=1006&userId=
+
 #dataHub
 datahub.endpoint=https://dh-cn-shanghai.aliyuncs.com
 datahub.accessId=LTAI5tEWU1j9H2poG4zWgfEP
@@ -77,12 +78,15 @@ datahub.accessSecret=p9tVmeDeeEENKhfsBsSeYc0F0ggH5b
 datahub.topic=s_hera_api_external_user_test
 datahub.corpTopic=ods_hera_msv_corp_data
 datahub.project=hera
+
 es.host=es-cn-4591gc2fx0001549q.public.elasticsearch.aliyuncs.com
 es.username=elastic
 es.password=moka6_3moka
 es.port=9200
+
 #typer接口
 typer.url=http://new-typer-combine-svc/api
+
 #定时任务全局开关，线上环境需要开启
 cronjob.power=false