提交获取权限的供应商

forest-admin/admin-mbg/src/main/java/com/hwrj/cloud/admin/model/UmsAdmin.java

@@ -32,6 +32,12 @@ public class UmsAdmin implements Serializable {
     @ApiModelProperty(value = "帐号启用状态：0->禁用；1->启用")
     private Integer status;
 
+    @ApiModelProperty(value = "供应商id")
+    private Long compId;
+
+    @ApiModelProperty(value = "供应商名称")
+    private String compName;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -114,6 +120,22 @@ public class UmsAdmin implements Serializable {
         this.status = status;
     }
 
+    public Long getCompId() {
+        return compId;
+    }
+
+    public void setCompId(Long compId) {
+        this.compId = compId;
+    }
+
+    public String getCompName() {
+        return compName;
+    }
+
+    public void setCompName(String compName) {
+        this.compName = compName;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -130,6 +152,8 @@ public class UmsAdmin implements Serializable {
         sb.append(", createTime=").append(createTime);
         sb.append(", loginTime=").append(loginTime);
         sb.append(", status=").append(status);
+        sb.append(", compId=").append(compId);
+        sb.append(", compName=").append(compName);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

forest-admin/admin-mbg/src/main/java/com/hwrj/cloud/admin/model/UmsAdminExample.java

@@ -764,6 +764,136 @@ public class UmsAdminExample {
             addCriterion("status not between", value1, value2, "status");
             return (Criteria) this;
         }
+
+        public Criteria andCompIdIsNull() {
+            addCriterion("comp_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompIdIsNotNull() {
+            addCriterion("comp_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompIdEqualTo(Long value) {
+            addCriterion("comp_id =", value, "compId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompIdNotEqualTo(Long value) {
+            addCriterion("comp_id <>", value, "compId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompIdGreaterThan(Long value) {
+            addCriterion("comp_id >", value, "compId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("comp_id >=", value, "compId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompIdLessThan(Long value) {
+            addCriterion("comp_id <", value, "compId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompIdLessThanOrEqualTo(Long value) {
+            addCriterion("comp_id <=", value, "compId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompIdIn(List<Long> values) {
+            addCriterion("comp_id in", values, "compId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompIdNotIn(List<Long> values) {
+            addCriterion("comp_id not in", values, "compId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompIdBetween(Long value1, Long value2) {
+            addCriterion("comp_id between", value1, value2, "compId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompIdNotBetween(Long value1, Long value2) {
+            addCriterion("comp_id not between", value1, value2, "compId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompNameIsNull() {
+            addCriterion("comp_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompNameIsNotNull() {
+            addCriterion("comp_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompNameEqualTo(String value) {
+            addCriterion("comp_name =", value, "compName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompNameNotEqualTo(String value) {
+            addCriterion("comp_name <>", value, "compName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompNameGreaterThan(String value) {
+            addCriterion("comp_name >", value, "compName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompNameGreaterThanOrEqualTo(String value) {
+            addCriterion("comp_name >=", value, "compName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompNameLessThan(String value) {
+            addCriterion("comp_name <", value, "compName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompNameLessThanOrEqualTo(String value) {
+            addCriterion("comp_name <=", value, "compName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompNameLike(String value) {
+            addCriterion("comp_name like", value, "compName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompNameNotLike(String value) {
+            addCriterion("comp_name not like", value, "compName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompNameIn(List<String> values) {
+            addCriterion("comp_name in", values, "compName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompNameNotIn(List<String> values) {
+            addCriterion("comp_name not in", values, "compName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompNameBetween(String value1, String value2) {
+            addCriterion("comp_name between", value1, value2, "compName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompNameNotBetween(String value1, String value2) {
+            addCriterion("comp_name not between", value1, value2, "compName");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

forest-admin/admin-mbg/src/main/resources/com/hwrj/cloud/admin/mapper/UmsAdminMapper.xml

@@ -12,6 +12,8 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="login_time" jdbcType="TIMESTAMP" property="loginTime" />
     <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="comp_id" jdbcType="BIGINT" property="compId" />
+    <result column="comp_name" jdbcType="VARCHAR" property="compName" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -72,7 +74,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, username, password, icon, email, nick_name, note, create_time, login_time, status
+    id, username, password, icon, email, nick_name, note, create_time, login_time, status, 
+    comp_id, comp_name
   </sql>
   <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsAdminExample" resultMap="BaseResultMap">
     select
@@ -110,12 +113,12 @@
     </selectKey>
     insert into ums_admin (username, password, icon, 
       email, nick_name, note, 
-      create_time, login_time, status
-      )
+      create_time, login_time, status, 
+      comp_id, comp_name)
     values (#{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{icon,jdbcType=VARCHAR}, 
       #{email,jdbcType=VARCHAR}, #{nickName,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{loginTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}
-      )
+      #{createTime,jdbcType=TIMESTAMP}, #{loginTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, 
+      #{compId,jdbcType=BIGINT}, #{compName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsAdmin">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -150,6 +153,12 @@
       <if test="status != null">
         status,
       </if>
+      <if test="compId != null">
+        comp_id,
+      </if>
+      <if test="compName != null">
+        comp_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="username != null">
@@ -179,6 +188,12 @@
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
+      <if test="compId != null">
+        #{compId,jdbcType=BIGINT},
+      </if>
+      <if test="compName != null">
+        #{compName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsAdminExample" resultType="java.lang.Long">
@@ -220,6 +235,12 @@
       <if test="record.status != null">
         status = #{record.status,jdbcType=INTEGER},
       </if>
+      <if test="record.compId != null">
+        comp_id = #{record.compId,jdbcType=BIGINT},
+      </if>
+      <if test="record.compName != null">
+        comp_name = #{record.compName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -236,7 +257,9 @@
       note = #{record.note,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       login_time = #{record.loginTime,jdbcType=TIMESTAMP},
-      status = #{record.status,jdbcType=INTEGER}
+      status = #{record.status,jdbcType=INTEGER},
+      comp_id = #{record.compId,jdbcType=BIGINT},
+      comp_name = #{record.compName,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -271,6 +294,12 @@
       <if test="status != null">
         status = #{status,jdbcType=INTEGER},
       </if>
+      <if test="compId != null">
+        comp_id = #{compId,jdbcType=BIGINT},
+      </if>
+      <if test="compName != null">
+        comp_name = #{compName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -284,7 +313,9 @@
       note = #{note,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       login_time = #{loginTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER}
+      status = #{status,jdbcType=INTEGER},
+      comp_id = #{compId,jdbcType=BIGINT},
+      comp_name = #{compName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

forest-admin/admin-mbg/src/main/resources/generatorConfig.xml

@@ -37,7 +37,7 @@
         <javaClientGenerator type="XMLMAPPER" targetPackage="com.hwrj.cloud.admin.mapper"
                              targetProject="forest-admin\admin-mbg\src\main\java"/>
         <!--生成全部表tableName设为%-->
-        <table tableName="pms_product">
+        <table tableName="ums_admin">
             <generatedKey column="id" sqlStatement="MySql" identity="true"/>
         </table>
     </context>

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/CompanyToCompanyController.java

@@ -0,0 +1,60 @@
+package com.hwrj.cloud.admin.controller;
+
+import com.hwrj.cloud.admin.model.UmsAdmin;
+import com.hwrj.cloud.admin.model.UmsCompanyInfo;
+import com.hwrj.cloud.admin.service.UmsAdminService;
+import com.hwrj.cloud.admin.service.UmsCompanyService;
+import com.hwrj.cloud.admin.service.impl.UmsCompanyInfoServiceImpl;
+import com.hwrj.cloud.common.api.CommonPage;
+import com.hwrj.cloud.common.api.CommonResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Authorization;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.security.Principal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@RestController
+@Api(tags = "通过数据权限获取")
+@RequestMapping(value = "/comp")
+public class CompanyToCompanyController {
+    @Autowired
+    private UmsCompanyService umsCompanyService;
+
+    @Autowired
+    private UmsAdminService adminService;
+
+    @ApiOperation("通用性获取供应商")
+    @GetMapping("/search")
+    public CommonResult searchCompany(@RequestParam(required = false,defaultValue = "")String key,@RequestParam(defaultValue = "1")int pageNo,@RequestParam(defaultValue = "15")int pageSize, Principal principal){
+        if (principal == null){
+            return CommonResult.unauthorized(null);
+        }
+        String username = principal.getName();
+        UmsAdmin umsAdmin = adminService.getAdminByUsername(username);
+        if(umsAdmin == null){
+            return CommonResult.unauthorized(null);
+        }
+        Long compId = umsAdmin.getCompId();
+        int type = 0;
+        if (compId == null){
+            type = 1;
+        }
+        List<UmsCompanyInfo> infos = umsCompanyService.searchCompanyInfo(key, pageNo, pageSize, compId);
+        CommonPage<UmsCompanyInfo> infoCommonPage = CommonPage.restPage(infos);
+        Map<String,Object> map = new HashMap<>();
+        map.put("type",type);
+        map.put("data",infoCommonPage);
+        return CommonResult.success(map);
+    }
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/FileUploadController.java

@@ -6,10 +6,7 @@ import com.hwrj.cloud.common.api.CommonResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 @Api(tags = "FileUploadController",description = "图片上传接口")
@@ -21,12 +18,15 @@ public class FileUploadController  {
     private UploadFileUtil uploadFileUtil;
 
     @ApiOperation("上传接口")
-    @GetMapping("/file")
+    @PostMapping("/fileImg")
     public CommonResult uploadFile(@RequestParam(value = "file") MultipartFile file,String type){
+        type =1+"";
         if ((!"123456".contains(type))||type.length()>1){
             return CommonResult.failed("上传失败");
         }
-        uploadFileUtil.uploadQiNiuFiles(file,"0/"+type+"/"+ OrderNo.NextOrderNo());
-        return CommonResult.success();
+        String s = uploadFileUtil.uploadQiNiuFiles(file, "0/" + type + "/" + OrderNo.NextOrderNo());
+        return CommonResult.success(s);
     }
+
+
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/UmsResourceController.java

@@ -93,6 +93,7 @@ public class UmsResourceController {
     @ResponseBody
     public CommonResult<List<UmsResource>> listAll() {
         List<UmsResource> resourceList = resourceService.listAll();
+
         return CommonResult.success(resourceList);
     }
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/UmsAdminParam.java

@@ -29,4 +29,10 @@ public class UmsAdminParam {
     private String nickName;
     @ApiModelProperty(value = "备注")
     private String note;
+
+    @ApiModelProperty(value = "供应商id")
+    private String compId;
+
+    @ApiModelProperty(value = "供应商名称")
+    private String compName;
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/UmsCompanyService.java

@@ -2,6 +2,7 @@ package com.hwrj.cloud.admin.service;
 
 import com.hwrj.cloud.admin.dto.UmsCompanyDto;
 import com.hwrj.cloud.admin.excelEntity.UmsCompanyInfoExcel;
+import com.hwrj.cloud.admin.model.UmsAdmin;
 import com.hwrj.cloud.admin.model.UmsCompanyFile;
 import com.hwrj.cloud.admin.model.UmsCompanyInfo;
 import com.hwrj.cloud.admin.model.UmsCompanyShop;
@@ -110,6 +111,9 @@ public interface UmsCompanyService {
     public void deleteCompanyShopByCompId(Long compId,Long userId);
 
 
+    public List<UmsCompanyInfo>  searchCompanyInfo(String key, int pageNo, int pageSize, Long compId);
+
+
 
 
 

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsAdminServiceImpl.java

@@ -90,6 +90,7 @@ public class UmsAdminServiceImpl implements UmsAdminService {
         umsAdmin.setCreateTime(new Date());
         umsAdmin.setStatus(1);
         //查询是否有相同用户名的用户
+
         UmsAdminExample example = new UmsAdminExample();
         example.createCriteria().andUsernameEqualTo(umsAdmin.getUsername());
         List<UmsAdmin> umsAdminList = adminMapper.selectByExample(example);

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsCompanyInfoServiceImpl.java

@@ -271,4 +271,22 @@ public class UmsCompanyInfoServiceImpl implements UmsCompanyService {
         umsCompanyShopMapper.updateByExample(shop,shopExample);
     }
 
+    @Override
+    public List<UmsCompanyInfo> searchCompanyInfo(String key,int pageNo,int pageSize,Long compId) {
+        PageHelper.startPage(pageNo,pageSize);
+        UmsCompanyInfoExample umsCompanyInfoExample = new UmsCompanyInfoExample();
+        UmsCompanyInfoExample.Criteria criteria = umsCompanyInfoExample.createCriteria();
+        if (compId != null){
+            criteria.andIdEqualTo(compId);
+        }else {
+            if (StringUtils.isEmpty(key)){
+                criteria.andCompNameLike("%"+key+"%");
+            }
+        }
+
+        List<UmsCompanyInfo> umsCompanyInfos = umsCompanyInfoMapper.selectByExample(umsCompanyInfoExample);
+        return umsCompanyInfos;
+
+    }
+
 }

forest-common/src/main/java/com/hwrj/cloud/common/util/CompanyInfo.java

@@ -0,0 +1,22 @@
+package com.hwrj.cloud.common.util;
+
+public class CompanyInfo {
+    private Long id;
+    private String compName;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCompName() {
+        return compName;
+    }
+
+    public void setCompName(String compName) {
+        this.compName = compName;
+    }
+}

forest-common/src/main/java/com/hwrj/cloud/common/util/InvitationCodeUtil.java

@@ -1,42 +1,51 @@
 package com.hwrj.cloud.common.util;
 
+import org.apache.catalina.User;
+
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Random;
 
 public class InvitationCodeUtil {
 
-    private static final char[] CHARS = new char[] {'F', 'L', 'G', 'W', '5', 'X', 'C', '3',
-            '9', 'Z', 'M', '6', '7', 'Y', 'R', 'T', '2', 'H', 'S', '8', 'D', 'V', 'E', 'J', '4', 'K',
-            'Q', 'P', 'U', 'A', 'N', 'B'};
-//    private static final String PRIME1 =
-
-//    /**
-//     * 生成邀请码
-//     *
-//     * @param id 唯一的id主键
-//     * @return code
-//     */
-//    String gen(Long id) {
-//        //补位，并扩大整体
-//        id = id * PRIME1 + SLAT;
-//        //将 id 转换成32进制的值
-//        long[] b = new long[CODE_LENGTH];
-//        //32进制数
-//        b[0] = id;
-//        for (int i = 0; i < CODE_LENGTH - 1; i++) {
-//            b[i + 1] = b[i] / CHARS_LENGTH;
-//            //扩大每一位的差异
-//            b[i] = (b[i] + i * b[0]) % CHARS_LENGTH;
-//        }
-//        b[5] = (b[0] + b[1] + b[2] + b[3] + b[4]) * PRIME1 % CHARS_LENGTH;
-//
-//        //进行混淆
-//        long[] codeIndexArray = new long[CODE_LENGTH];
-//        for (int i = 0; i < CODE_LENGTH; i++) {
-//            codeIndexArray[i] = b[i * PRIME2 % CODE_LENGTH];
-//        }
-//
-//        StringBuilder buffer = new StringBuilder();
-//        Arrays.stream(codeIndexArray).boxed().map(Long::intValue).map(t -> CHARS[t]).forEach(buffer::append);
-//        return buffer.toString();
-//    }
+    private static final String[] storeInvitationChars={"a","c","b","d","f","e","h","i","j","k","l","m","n","o","p"
+            ,"q","r","s","t","u","v","w","x","y","z","0","1","2","3","4","5","6","7","8","9"};
+    /**
+     * @author liushuaic
+     * @date 2015/11/18 14:53
+     * @desc  生成邀请码
+     * 格式： 15（年）+01（月）+18（日）+id
+     * */
+    public static Integer generateInvitationCode(CompanyInfo companyInfo){
+        Date date= Calendar.getInstance().getTime();
+        SimpleDateFormat sdf2=new SimpleDateFormat("YYMMdd");
+        String dateStr= sdf2.format(date);
+        return Integer.valueOf(dateStr+companyInfo.getId().toString());
+    }
+    /**
+     * @author liushuaic
+     * @date 2015/11/26 18:01
+     * @desc  生成邀请码
+     * 格式： abcd12
+     * */
+    public static String generateInvitationCodeTwo(CompanyInfo user){
+        String userIdStr=user.getId().toString();
+        int forSize=5-userIdStr.length();
+        String randomStr="";
+        for(int i=0;i<forSize;i++){
+            Random random=new Random();
+            int randomIndex=random.nextInt(35);
+            randomStr=randomStr+storeInvitationChars[randomIndex];
+        }
+        return randomStr+userIdStr;
+    }
+    public static void main(String[] args) {
+        //System.out.println(storeInvitationChars.length);
+        CompanyInfo user=new CompanyInfo();
+        user.setId(23l);
+        String invitationCode=InvitationCodeUtil.generateInvitationCodeTwo(user);
+        System.out.println(invitationCode);
+    }
 }

nacos/conf/application.properties

@@ -36,7 +36,7 @@ server.port=8898
  db.num=1
 
 ### Connect URL of DB:
- db.url.0=jdbc:mysql://172.16.90.253:3306/forest-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC
+ db.url.0=jdbc:mysql://172.16.90.253:3306/forest-qb-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC
  db.user=root
  db.password=123456
 
@@ -52,7 +52,7 @@ server.port=8898
 # nacos.naming.distro.syncRetryDelay=5000
 
 ### If enable data warmup. If set to false, the server would accept request without local data preparation:
-# nacos.naming.data.warmup=true
+nacos.naming.data.warmup=false
 
 ### If enable the instance auto expiration, kind like of health check of instance:
 # nacos.naming.expireInstance=true

nacos/data/config-data/DEFAULT_GROUP/forest-admin

@@ -0,0 +1,121 @@
+spring:
+  datasource:
+    url: jdbc:mysql://172.16.90.253:3306/forest-cloud-mall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+    username: root
+    password: 123456
+    druid:
+      #连接池初始化大小
+      initial-size: 5 
+      #最小空闲连接数
+      min-idle: 10
+      #最大连接数
+      max-active: 20 
+      web-stat-filter:
+        #不统计这些请求数据
+        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*" 
+        #访问监控网页的登录用户名和密码
+      stat-view-servlet: 
+        login-username: druid
+        login-password: druid
+  servlet:
+    multipart:
+      enabled: true
+      file-size-threshold: 0
+      max-file-size: 100000000
+      max-request-size: 100000000
+  redis:
+    host: 172.16.90.64 # Redis服务器地址
+    database: 0 # Redis数据库索引（默认为0）
+    port: 6379 # Redis服务器连接端口
+    # Redis服务器连接密码（默认为空）
+    password: 
+    timeout: 300ms # 连接超时时间（毫秒）
+  zipkin:
+    base-url: http://localhost:9411
+    locator:
+      discovery:
+        enabled: true
+  sleuth:
+    sampler:
+      # zipkin 抽样比例 在默认情况下，该值为0.1
+      probability: 1.0
+  boot:
+    admin:
+      client:
+        # admin 服务端的地址
+        url: http://localhost:8095
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      # 展示详情
+      show-details: always
+mybatis:
+  mapper-locations:
+    - classpath:dao/*.xml
+    - classpath*:com/**/mapper/*.xml
+logging:
+  level:
+    #日志配置DEBUG,INFO,WARN,ERROR
+    root: info 
+    com.hwrj.cloud: debug
+
+  sleuth:
+    sampler:
+      # zipkin 抽样比例 在默认情况下，该值为0.1
+      probability: 1.0
+  boot:
+    admin:
+      client:
+        # admin 服务端的地址
+        url: http://localhost:9091
+
+# 过滤不需要认证路径条件         
+secure:
+  ignored:
+    urls:
+      - /swagger-ui.html
+      - /swagger-resources/**
+      - /swagger/**
+      - /**/v2/api-docs
+      - /**/*.js
+      - /**/*.css
+      - /**/*.png
+      - /**/*.ico
+      - /webjars/springfox-swagger-ui/**
+      - /actuator/**
+      - /druid/**
+      - /admin/login
+      - /admin/register
+      - /admin/info
+      - /admin/logout
+      - /minio/upload
+      - /product/import
+      - /big/**
+      - /bigData/**
+      - /upload/**
+jwt:
+  tokenHeader: Authorization
+  secret: forest-admin-secret
+  expiration: 604800
+  tokenHead: Bearer
+
+redis:
+  database: forest
+  key:
+    admin: 'ums:admin'
+    token: 'ums:token'
+    resourceList: 'ums:resourceList'
+  expire:
+    common: 86400 # 24小时
+
+qiniu:
+  accessKey: FLWUJxiZY1_N-5d6J_jsdgbqyjVDUg86ghZHsaQW
+  bucket: forestcloud
+  path: http://fqn.hongweisoft.com/
+  processName: 'null'
+  secretKey: So55w4fQ2dTQ6uMlWuUywmKG8ZTqVhWfr_3Ii7GI

nacos/data/config-data/DEFAULT_GROUP/forest-gateway

@@ -0,0 +1,69 @@
+spring:
+  redis:
+    host: 172.16.90.64
+    database: 0
+    port: 6379
+    password:
+    timeout: 300ms
+  boot:
+    admin:
+      client:
+        # admin 服务端的地址
+        url: http://localhost:9091
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      # 展示详情
+      show-details: always
+# 过滤不需要认证路径条件
+secure:
+  ignored:
+    urls: #安全路径白名单
+      - /swagger-ui.html
+      - /swagger-resources/**
+      - /swagger/**
+      - /**/v2/api-docs
+      - /**/*.js
+      - /**/*.css
+      - /**/*.png
+      - /**/*.ico
+      - /webjars/springfox-swagger-ui/**
+      - /actuator/**
+      - /druid/**
+      - /home/**
+      - /product/**
+      - /wechat/h5/authorize
+      - /wechat/h5/userInfo
+      - /admin/login
+      - /sso/login
+      - /sso/getLoginCode
+      - /sso/register
+      - /sso/getAuthCode
+      - /admin/register
+      - /admin/info
+      - /admin/logout
+      - /minio/upload
+      - /sso/loginPhone
+      - /product/import
+      - /big/**
+      - /bigData/**
+      - /upload/**
+jwt:
+  tokenHeader: Authorization
+  secret: forest-admin-secret
+  expiration: 604800
+  tokenHead: Bearer
+redis:
+  database: forest
+  key:
+    admin: 'ums:admin'
+    token: 'ums:token'
+    resourceList: 'ums:resourceList'
+  expire:
+    #24小时
+    common: 86400 

nacos/data/config-data/DEFAULT_GROUP/forest-portal

@@ -0,0 +1,121 @@
+spring:
+  datasource:
+    url: jdbc:mysql://172.16.90.253:3306/forest-cloud-mall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+    username: root
+    password: 123456
+    druid:
+      initial-size: 5 #连接池初始化大小
+      min-idle: 10 #最小空闲连接数
+      max-active: 20 #最大连接数
+      web-stat-filter:
+        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*" #不统计这些请求数据
+      stat-view-servlet: #访问监控网页的登录用户名和密码
+        login-username: druid
+        login-password: druid
+  boot:
+    admin:
+      client:
+        # admin 服务端的地址
+        url: http://localhost:9091
+
+
+  redis:
+    # Redis服务器地址
+    host: 172.16.90.64 
+    # Redis数据库索引（默认为0）
+    database: 0 
+    # Redis服务器连接端口
+    port: 6379 
+    password: # Redis服务器连接密码（默认为空）
+    timeout: 300ms # 连接超时时间（毫秒）
+
+  rabbitmq:
+    host: 172.16.90.64
+    port: 5672
+    virtual-host: /forest
+    username: forest
+    password: 123456
+    #如果对异步消息需要回调必须设置为true
+    publisher-confirms: true 
+
+# 日志配置
+logging:
+  level:
+    org.springframework.data.mongodb.core: debug
+    com.hwrj.cloud.portal.mapper: debug
+    com.hwrj.cloud.portal.dao: debug
+
+mybatis:
+  mapper-locations:
+    - classpath:dao/*.xml
+    - classpath*:com/**/mapper/*.xml
+
+jwt:
+  tokenHeader: Authorization #JWT存储的请求头
+  secret: forest-admin-secret #JWT加解密使用的密钥
+  expiration: 604800 #JWT的超期限时间(60*60*24*7)
+  tokenHead: Bearer  #JWT负载中拿到开头
+
+
+
+secure:
+  ignored:
+    urls: #安全路径白名单
+      - /swagger-ui.html
+      - /swagger-resources/**
+      - /swagger/**
+      - /**/v2/api-docs
+      - /**/*.js
+      - /**/*.css
+      - /**/*.png
+      - /**/*.ico
+      - /webjars/springfox-swagger-ui/**
+      - /druid/**
+      - /actuator/**
+      - /sso/**
+      - /wechat/**
+      - /home/**
+      - /product/**
+      - /brand/**
+
+
+# 消息队列定义
+rabbitmq:
+  queue:
+    name:
+      cancelOrder: cancelOrderQueue
+# 自定义redis key
+redis:
+  database: forest
+  key:
+    authCode: 'ums:authCode'
+    telLoginCode: 'ums:authCode'
+    orderId: 'oms:orderId'
+    member: 'ums:member'
+    token: 'ums:token'
+  expire:
+    authCode: 90 # 验证码超期时间
+    authLoginCode: 240 # 验证码超期时间
+    common: 86400 # 24小时
+
+forest:
+  wx: 
+    password: forest123456
+
+sms:
+  accessKeyId: LTAICB9TH0OAN3yJ
+  accessKeySecret: lCuyL3MUQRLfoVw39W0NqWdVGoLV60
+  signName: 慧云网安
+wx:
+  mp:
+    aesKey: 123
+    appId: wxbe90cc7c5233dd84
+    secret: ec4a18ce1a7bcf17cf592c3d57cec68a
+    token: 123
+    url: http://tanhui.hongweisoft.com/forest-portal/wechat/h5/userInfo
+    before: http://172.16.90.25:8080
+
+
+
+
+

nacos/data/naming/meta.properties

@@ -1,2 +1,2 @@
-#Wed Sep 23 16:00:27 CST 2020
-term=4855
+#Thu Sep 24 17:30:42 CST 2020
+term=647

read.md

@@ -17,8 +17,14 @@
 1. 角色控制接口权限
 2. 在用户中添加对应的供应商，通过供应商来做数据权限
 #### 修改过的表
-1. 
-
+1. ums_admin 添加字段comp_id(供应商id)，comp_name(供应商名称);
+### 配置文件修改该记录
+ 1. servlet:
+    multipart:
+      enabled: true
+      file-size-threshold: 0
+      max-file-size: 100Mb
+      max-request-size: 100Mb
 ## 产品功能开发（赵东东）