Merge branch 'master' of http://git.mokasz.com/marketing/moka-private

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

@@ -1,11 +1,14 @@
 package com.mokamrp.privates.controller.pangu;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.controller.BaseController;
-import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.pangu.FosterwxFlowListHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxFlowList;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobilePool;
 import com.mokamrp.privates.service.pangu.FosterwxFlowListService;
+import com.mokamrp.privates.service.pangu.FosterwxMobilePoolService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.time.LocalDateTime;
 import java.util.Map;
 
 
@@ -32,6 +36,9 @@ public class FosterwxFlowListController extends BaseController<FosterwxFlowList>
     @Autowired
     public FosterwxFlowListService fosterwxFlowListService;
 
+    @Autowired
+    public FosterwxMobilePoolService fosterwxMobilePoolService;
+
     /*
      * @fast
      * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
@@ -39,14 +46,72 @@ public class FosterwxFlowListController extends BaseController<FosterwxFlowList>
      */
 
     @PostMapping("/list")
-    public Object list(@Valid @RequestBody PostBasePageHandle postBasePageHandle, BindingResult bindingResult) {
+    public Object list(@Valid @RequestBody FosterwxFlowListHandle fosterwxFlowListHandle, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
-        Map<String, Object> res = fosterwxFlowListService.getList(postBasePageHandle);
+        Map<String, Object> res = fosterwxFlowListService.getList(fosterwxFlowListHandle);
         return AjaxResult.success(res);
     }
 
+    @PostMapping("/changeStatus")
+    public Object changeStatus(FosterwxFlowList fosterwxFlowList) {
+        // 先从个微池中获取进粉阈值
+        FosterwxMobilePool fosterwxMobilePool = fosterwxMobilePoolService.getOne(new QueryWrapper<FosterwxMobilePool>().eq("pool_index", fosterwxFlowList.getPoolId()).last("Limit 1"));
+
+        // 最大进粉阈值
+        Integer maxFans = Integer.valueOf(fosterwxMobilePool.getMaxFans());
+
+        // 查看是否超过百分之五十
+        if (fosterwxFlowList.getBusFans() > maxFans / 2.0) {
+            // 超过
+            // 更新个微池状态为停用
+            fosterwxMobilePool.setStatus(0);
+            fosterwxMobilePool.setUpdateUid(fosterwxFlowList.getUpdateUid());
+            fosterwxMobilePool.setUpdateAt(LocalDateTime.now());
+            fosterwxMobilePoolService.updateById(fosterwxMobilePool);
+
+            // 更新
+            FosterwxFlowList lastPosition = fosterwxFlowListService.getOne(new QueryWrapper<FosterwxFlowList>().eq("pool_id", fosterwxFlowList.getPoolId()));
+            String position = "";
+            if (null == lastPosition) {
+                // 新开账号 需要激活个微池状态
+                position = "1001";
+            } else {
+                position = String.valueOf(Integer.parseInt(lastPosition.getFlowPosition()) + 1);
+            }
+            // 设置流量位置
+            fosterwxFlowList.setFlowPosition(position);
+            // 设置状态
+            fosterwxFlowList.setStatus(0);
+            fosterwxFlowListService.save(fosterwxFlowList);
+            // 更新全部位置为超限
+            fosterwxFlowListService.update(new FosterwxFlowList(1), new QueryWrapper<FosterwxFlowList>().eq("pool_id", fosterwxFlowList.getPoolId()));
+        } else {
+            // 未超过
+            // 查找上一个流量位置
+            FosterwxFlowList lastPosition = fosterwxFlowListService.getOne(new QueryWrapper<FosterwxFlowList>().eq("pool_id", fosterwxFlowList.getPoolId()));
+            String position = "";
+            if (null == lastPosition) {
+                // 新开账号 需要激活个微池状态
+                position = "1001";
+                fosterwxMobilePool.setStatus(2);
+                fosterwxMobilePool.setUpdateUid(fosterwxFlowList.getUpdateUid());
+                fosterwxMobilePool.setUpdateAt(LocalDateTime.now());
+                fosterwxMobilePoolService.updateById(fosterwxMobilePool);
 
+            } else {
+                position = String.valueOf(Integer.parseInt(lastPosition.getFlowPosition()) + 1);
+            }
+            // 设置流量位置
+            fosterwxFlowList.setFlowPosition(position);
+            // 设置状态
+            fosterwxFlowList.setStatus(1);
+            fosterwxFlowListService.save(fosterwxFlowList);
+        }
+
+
+        return AjaxResult.success("操作成功！");
+    }
 }
 

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

@@ -1,13 +1,16 @@
 package com.mokamrp.privates.controller.pangu;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.controller.BaseController;
 import com.mokamrp.privates.entity.EditHandle;
 import com.mokamrp.privates.entity.pangu.FosterwxMobilePoolHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.interceptor.AuthUser;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxFlowList;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobilePool;
 import com.mokamrp.privates.mapper.pojo.User;
+import com.mokamrp.privates.service.pangu.FosterwxFlowListService;
 import com.mokamrp.privates.service.pangu.FosterwxMobilePoolService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 
@@ -37,6 +41,9 @@ public class FosterwxMobilePoolController extends BaseController<FosterwxMobileP
     @Autowired
     public FosterwxMobilePoolService fosterwxMobilePoolService;
 
+    @Autowired
+    public FosterwxFlowListService fosterwxFlowListService;
+
     /*
      * @fast
      * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
@@ -65,6 +72,24 @@ public class FosterwxMobilePoolController extends BaseController<FosterwxMobileP
         return AjaxResult.success("新增成功！");
     }
 
+    @PostMapping("/getOutOfServerList")
+    public Object getOutOfServerList(@Valid @RequestBody FosterwxMobilePoolHandle fosterwxMobilePoolHandle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        fosterwxMobilePoolHandle.setStatus(0);
+        fosterwxMobilePoolHandle.setPage(1);
+        fosterwxMobilePoolHandle.setPageSize(999999999);
+        Map<String, Object> res = fosterwxMobilePoolService.getList(fosterwxMobilePoolHandle);
+        List<FosterwxMobilePool> fosterwxMobilePoolList = (List<FosterwxMobilePool>) res.get("list");
+
+        fosterwxMobilePoolList.forEach(fosterwxMobilePool -> {
+            fosterwxMobilePool.setFans(String.valueOf(fosterwxFlowListService.getOne(new QueryWrapper<FosterwxFlowList>().eq("pool_id", fosterwxMobilePool.getPoolIndex()).orderByDesc("id").last("Limit 1")).getBusFans()));
+        });
+
+        return AjaxResult.success(res);
+    }
+
 
 }
 

src/main/java/com/mokamrp/privates/entity/pangu/FosterwxFlowListHandle.java

@@ -0,0 +1,11 @@
+package com.mokamrp.privates.entity.pangu;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+@Data
+public class FosterwxFlowListHandle extends Model<FosterwxFlowListHandle> {
+    private Integer page;
+    private Integer pageSize;
+    private String poolIndex;
+}

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxFlowListMapper.xml

@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterwxFlowList">
         <id column="id" property="id"/>
         <result column="time_line" property="timeLine"/>
+        <result column="pool_id" property="poolId"/>
         <result column="flow_position" property="flowPosition"/>
         <result column="bus_fans" property="busFans"/>
         <result column="feeder_id" property="feederId"/>
@@ -19,7 +20,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id
-        , time_line, flow_position, bus_fans, feeder_id, status, create_uid, update_uid, create_at, update_at
+        , time_line, pool_id, flow_position, bus_fans, feeder_id, status, create_uid, update_uid, create_at, update_at
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxFlowList">
         SELECT *

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxMobilePoolMapper.xml

@@ -12,6 +12,7 @@
         <result column="mobile_no" property="mobileNo"/>
         <result column="code_url" property="codeUrl"/>
         <result column="status" property="status"/>
+        <result column="wx_appid" property="wxAppid"/>
         <result column="max_fans" property="maxFans"/>
         <result column="bus_mobile_no" property="busMobileNo"/>
         <result column="flow_position" property="flowPosition"/>
@@ -24,7 +25,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id
-        , pool_index, station_id, station_name, mobile_code, mobile_no, code_url, status, max_fans, bus_mobile_no, flow_position, create_uid, update_uid, create_at, update_at
+        , pool_index, station_id, station_name, mobile_code, mobile_no, code_url, status, wx_appid, max_fans, bus_mobile_no, flow_position, create_uid, update_uid, create_at, update_at
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobilePool">
         SELECT *

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

@@ -21,6 +21,10 @@ public class FosterwxFlowList extends Model<FosterwxFlowList> {
 
     private static final long serialVersionUID = 1L;
 
+    public FosterwxFlowList(Integer status) {
+        this.status = status;
+    }
+
     /**
      * ID
      */
@@ -33,6 +37,11 @@ public class FosterwxFlowList extends Model<FosterwxFlowList> {
     private LocalDateTime timeLine;
 
     /**
+     * 个微池id
+     */
+    private Integer poolId;
+
+    /**
      * 流量位置
      */
     private String flowPosition;
@@ -89,6 +98,14 @@ public class FosterwxFlowList extends Model<FosterwxFlowList> {
         this.timeLine = timeLine;
     }
 
+    public Integer getPoolId() {
+        return poolId;
+    }
+
+    public void setPoolId(Integer poolId) {
+        this.poolId = poolId;
+    }
+
     public String getFlowPosition() {
         return flowPosition;
     }
@@ -163,6 +180,7 @@ public class FosterwxFlowList extends Model<FosterwxFlowList> {
         return "FosterwxFlowList{" +
                 "id=" + id +
                 ", timeLine=" + timeLine +
+                ", poolId=" + poolId +
                 ", flowPosition=" + flowPosition +
                 ", busFans=" + busFans +
                 ", feederId=" + feederId +

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

@@ -1,6 +1,7 @@
 package com.mokamrp.privates.mapper.pangu.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -63,10 +64,22 @@ public class FosterwxMobilePool extends Model<FosterwxMobilePool> {
     private Integer status;
 
     /**
+     * 微信appid
+     */
+    private String wxAppid;
+
+    /**
      * 每天进粉阈值
      */
     private String maxFans;
 
+
+    /**
+     * 当日进粉数量
+     */
+    @TableField(exist = false)
+    private String fans;
+
     /**
      * 企微客服手机号（冗余）
      */
@@ -162,6 +175,14 @@ public class FosterwxMobilePool extends Model<FosterwxMobilePool> {
         this.status = status;
     }
 
+    public String getWxAppid() {
+        return wxAppid;
+    }
+
+    public void setWxAppid(String wxAppid) {
+        this.wxAppid = wxAppid;
+    }
+
     public String getMaxFans() {
         return maxFans;
     }
@@ -170,6 +191,14 @@ public class FosterwxMobilePool extends Model<FosterwxMobilePool> {
         this.maxFans = maxFans;
     }
 
+    public String getFans() {
+        return fans;
+    }
+
+    public void setFans(String fans) {
+        this.fans = fans;
+    }
+
     public String getBusMobileNo() {
         return busMobileNo;
     }
@@ -234,7 +263,9 @@ public class FosterwxMobilePool extends Model<FosterwxMobilePool> {
                 ", mobileNo=" + mobileNo +
                 ", codeUrl=" + codeUrl +
                 ", status=" + status +
+                ", wxAppid=" + wxAppid +
                 ", maxFans=" + maxFans +
+                ", fans=" + fans +
                 ", busMobileNo=" + busMobileNo +
                 ", flowPosition=" + flowPosition +
                 ", createUid=" + createUid +

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

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.service.pangu;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.pangu.FosterwxFlowListHandle;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxFlowList;
 
 import java.util.Map;
@@ -16,5 +16,5 @@ import java.util.Map;
  */
 public interface FosterwxFlowListService extends IService<FosterwxFlowList> {
     //.@leon 获取数据列表
-    public Map<String, Object> getList(PostBasePageHandle handle);
+    public Map<String, Object> getList(FosterwxFlowListHandle handle);
 }

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

@@ -1,8 +1,9 @@
 package com.mokamrp.privates.service.pangu.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.pangu.FosterwxFlowListHandle;
 import com.mokamrp.privates.mapper.pangu.FosterwxFlowListMapper;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxFlowList;
 import com.mokamrp.privates.service.pangu.FosterwxFlowListService;
@@ -10,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -32,13 +32,16 @@ public class FosterwxFlowListServiceImpl extends ServiceImpl<FosterwxFlowListMap
      * @param handle
      * @return
      */
-    public Map<String, Object> getList(PostBasePageHandle handle) {
-        Integer pagesize = handle.getPagesize();
+    @Override
+    public Map<String, Object> getList(FosterwxFlowListHandle handle) {
+        Integer pageSize = handle.getPageSize();
         Integer page = handle.getPage();
-        Page<FosterwxFlowList> pageObj = new Page<FosterwxFlowList>(page, pagesize);
-        List<FosterwxFlowList> list = fosterwxFlowListMapper.getList(pageObj);
+        Page<FosterwxFlowList> pageObj = new Page<FosterwxFlowList>(page, pageSize);
+        LambdaQueryWrapper<FosterwxFlowList> fosterwxFlowListLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        fosterwxFlowListLambdaQueryWrapper.eq(FosterwxFlowList::getPoolId, handle.getPoolIndex());
+        pageObj = fosterwxFlowListMapper.selectPage(pageObj, fosterwxFlowListLambdaQueryWrapper);
         Map<String, Object> resMap = new HashMap<String, Object>();
-        resMap.put("list", list);
+        resMap.put("list", pageObj.getRecords());
         resMap.put("total", pageObj.getTotal());
         return resMap;
     }

src/main/resources/application-local.properties

@@ -52,7 +52,10 @@ xxl-sso.excluded.paths=/healthy,\
   /pangu/fosterwxMobile/delMobile,\
   /pangu/fosterwxMobile/editMobile,\
   /pangu/fosterwxMobile/mobileInfo,\
-  /pangu/fosterwxMobile/addMobilePro
+  /pangu/fosterwxMobile/addMobilePro,\
+  /pangu/fosterwxFlowList/changeStatus,\
+  /pangu/fosterwxFlowList/list,\
+  /pangu/fosterwxMobilePool/getOutOfServerList
 #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.mokamrp.com/space/menu/getMenuInterface?sysCode=1006&userId=

src/main/resources/application-prod.properties

@@ -1,32 +1,26 @@
 server.port=8085
 api.host=http://127.0.0.1
 api.wechatcallback=/weWork/callback
-
 spring.datasource.druid.max-idle=10
 spring.datasource.druid.max-wait=10000
 spring.datasource.druid.min-idle=5
 spring.datasource.druid.initial-size=5
 spring.datasource.druid.strict=false
-
 spring.datasource.dynamic.primary=db
-
 #后台数据库
 spring.datasource.dynamic.datasource.db.driverClassName=com.mysql.cj.jdbc.Driver
 spring.datasource.dynamic.datasource.db.url=jdbc:mysql://rm-uf6s9smcl373jjenc35930.mysql.rds.aliyuncs.com:3306/mochat?serverTimezone=GMT%2b8&useUnicode=true&characterEncoding=UTF-8
 spring.datasource.dynamic.datasource.db.username=mochat
 spring.datasource.dynamic.datasource.db.password=MoChat666$%MOchaT
-
 #大数据数据库
 spring.datasource.dynamic.datasource.datadb.url=jdbc:postgresql://hgmc-cn-7mz27ayc6003-cn-shanghai.hologres.aliyuncs.com:80/galaxy
 spring.datasource.dynamic.datasource.datadb.username=LTAI5tEWU1j9H2poG4zWgfEP
 spring.datasource.dynamic.datasource.datadb.password=p9tVmeDeeEENKhfsBsSeYc0F0ggH5b
 spring.datasource.dynamic.datasource.datadb.driverClassName=org.postgresql.Driver
-
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 spring.jpa.properties.hibernate.hbm2ddl.auto=update
 mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 mybatis-plus.configuration.map-underscore-to-camel-case=true
-
 spring.redis.host=r-uf6k0vhplkv7otzrjd.redis.rds.aliyuncs.com
 spring.redis.port=6379
 spring.redis.password=MoChat_RediS666MOchaT_Rd
@@ -36,7 +30,6 @@ spring.redis.jedis.pool.min-idle=0
 spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.max-active=20
 spring.redis.jedis.pool.max-wait=-1ms
-
 #阿里云oss配置(增加一个cdn地址配置)
 aliyun.host=https://mochat-oss.mokamrp.com/
 aliyun.endpoint=https://oss-cn-shanghai-internal.aliyuncs.com
@@ -45,7 +38,6 @@ aliyun.accessKeySecret=m7p2WBJXZuNon9stiuw494MnZQaT1N
 aliyun.bucketName=moka-mochat
 spring.servlet.multipart.max-request-size=10MB
 spring.servlet.multipart.max-file-size=10MB
-
 xxl.sso.server=https://sso.mokamrp.com/sso
 xxl.sso.logout.path=/logout
 xxl-sso.excluded.paths=/healthy,\
@@ -56,11 +48,12 @@ xxl-sso.excluded.paths=/healthy,\
   /pangu/fosterwxMobile/delMobile,\
   /pangu/fosterwxMobile/editMobile,\
   /pangu/fosterwxMobile/mobileInfo,\
-  /pangu/fosterwxMobile/addMobilePro
+  /pangu/fosterwxMobile/addMobilePro,\
+  /pangu/fosterwxFlowList/changeStatus,\
+  /pangu/fosterwxFlowList/list,\
+  /pangu/fosterwxMobilePool/getOutOfServerList
 xxl.sso.redis.address=redis://xxl-sso:MokaSapce666$%25_RediS@r-uf6727zrr24ioihy72.redis.rds.aliyuncs.com:6379/0
-
 menu.host=http://space-server-in-svc/space/menu/getMenuInterface?sysCode=1006&userId=
-
 datahub.endpoint=https://dh-cn-shanghai.aliyuncs.com
 datahub.accessId=LTAI5tEWU1j9H2poG4zWgfEP
 datahub.accessSecret=p9tVmeDeeEENKhfsBsSeYc0F0ggH5b

src/main/resources/application-test.properties

@@ -1,33 +1,26 @@
 server.port=8085
 api.host=http://127.0.0.1
 api.wechatcallback=/weWork/callback
-
 spring.datasource.druid.max-idle=10
 spring.datasource.druid.max-wait=10000
 spring.datasource.druid.min-idle=5
 spring.datasource.druid.initial-size=5
 spring.datasource.druid.strict=false
-
 spring.datasource.dynamic.primary=db
-
 #后台数据库
 spring.datasource.dynamic.datasource.db.driverClassName=com.mysql.cj.jdbc.Driver
 spring.datasource.dynamic.datasource.db.url=jdbc:mysql://172.18.71.27:3306/mochat?serverTimezone=GMT%2b8&useUnicode=true&characterEncoding=UTF-8
 spring.datasource.dynamic.datasource.db.username=typer
 spring.datasource.dynamic.datasource.db.password=jch9sh_shl
-
 #大数据数据库
 spring.datasource.dynamic.datasource.datadb.url=jdbc:postgresql://hgmc-cn-7mz27ayc6003-cn-shanghai.hologres.aliyuncs.com:80/galaxy
 spring.datasource.dynamic.datasource.datadb.username=LTAI5tEWU1j9H2poG4zWgfEP
 spring.datasource.dynamic.datasource.datadb.password=p9tVmeDeeEENKhfsBsSeYc0F0ggH5b
 spring.datasource.dynamic.datasource.datadb.driverClassName=org.postgresql.Driver
-
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 spring.jpa.properties.hibernate.hbm2ddl.auto=update
 mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 mybatis-plus.configuration.map-underscore-to-camel-case=true
-
-
 spring.redis.host=172.18.71.26
 spring.redis.port=6379
 spring.redis.password=Jch9shshl
@@ -37,7 +30,6 @@ spring.redis.jedis.pool.min-idle=0
 spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.max-active=20
 spring.redis.jedis.pool.max-wait=-1ms
-
 #阿里云oss配置(增加一个cdn地址配置)
 aliyun.host=http://mini-short-video-oss.lushenjin.cn/
 aliyun.endpoint=https://oss-cn-hangzhou.aliyuncs.com
@@ -46,7 +38,6 @@ aliyun.accessKeySecret=irLfHOni7ffLU3yAf3LsKEXwQLfrNc
 aliyun.bucketName=mini-short-video-test
 spring.servlet.multipart.max-request-size=10MB
 spring.servlet.multipart.max-file-size=10MB
-
 xxl.sso.server=https://sso.mokamrp.com/sso
 xxl.sso.logout.path=/logout
 xxl-sso.excluded.paths=/healthy,\
@@ -57,13 +48,13 @@ xxl-sso.excluded.paths=/healthy,\
 /pangu/fosterwxMobile/delMobile,\
 /pangu/fosterwxMobile/editMobile,\
 /pangu/fosterwxMobile/mobileInfo,\
-/pangu/fosterwxMobile/addMobilePro
+/pangu/fosterwxMobile/addMobilePro,\
+/pangu/fosterwxFlowList/changeStatus,\
+/pangu/fosterwxFlowList/list,\
+/pangu/fosterwxMobilePool/getOutOfServerList
 #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