招商基础

2024-03-07 11:33:54 +08:00
parent c0789d6932
commit 32942b5da9
75 changed files with 5001 additions and 179 deletions
--- a/coolstore-partner-webc/pom.xml
+++ b/coolstore-partner-webc/pom.xml
@@ -34,15 +34,15 @@
            <artifactId>aliyun-sdk-oss</artifactId>
        </dependency>
        <!-- 服务注册与发现依赖 -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
+<!--        </dependency>-->
+<!--        &lt;!&ndash; SpringCloud Alibaba Nacos Config &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
+<!--        </dependency>-->
        <!-- ELK -->
        <dependency>
            <groupId>com.github.danielwegener</groupId>
--- a/coolstore-partner-webc/src/main/java/com/cool/store/PartnerCWebApplication.java
+++ b/coolstore-partner-webc/src/main/java/com/cool/store/PartnerCWebApplication.java
@@ -21,7 +21,6 @@ import javax.sql.DataSource;
 * @Description: B端web层
 * @date 2023-05-17 11:28
 */
-@EnableDiscoveryClient
@SpringBootApplication
@MapperScan("com.cool.store.mapper")
@EnableAsync
--- a/coolstore-partner-webc/src/main/java/com/cool/store/config/SignValidateFilter.java
+++ b/coolstore-partner-webc/src/main/java/com/cool/store/config/SignValidateFilter.java
@@ -6,10 +6,12 @@ import com.cool.store.constants.CommonConstants;
 import com.cool.store.context.PartnerUserHolder;
 import com.cool.store.enums.ErrorCodeEnum;
 import com.cool.store.response.ResponseResult;
+import com.cool.store.service.WechatMiniAppService;
 import com.cool.store.utils.AESDecryptor;
 import com.cool.store.utils.Md5Utils;
 import com.cool.store.utils.Sha1Utils;
 import com.cool.store.utils.UUIDUtils;
+import com.cool.store.vo.PartnerUserInfoVO;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
@@ -36,8 +38,8 @@ import java.util.List;
@Slf4j
 public class SignValidateFilter implements Filter {

-//    @Resource
-//    private WechatMiniAppService wechatMiniAppService;
+    @Resource
+    private WechatMiniAppService wechatMiniAppService;

    @Value("${signKey}")
    private String signKey;
@@ -75,57 +77,57 @@ public class SignValidateFilter implements Filter {

    @Override
    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
-//        MDC.put(CommonConstants.REQUEST_ID, UUIDUtils.get32UUID());
-//        HttpServletResponse response = (HttpServletResponse) servletResponse;
-//        HttpServletRequest request = (HttpServletRequest) servletRequest;
-//        CustomHttpServletRequestWrapper wrapper = (CustomHttpServletRequestWrapper) request;
-//        String uri = request.getRequestURI();
-//        String method = request.getMethod();
-//        String userStr = "";
-//        boolean isInWhiteList = excludePath(uri);
-//        log.info("url:{}", uri);
-//        if ( !isInWhiteList && !method.equals("OPTIONS")) {
-//            String params = "";
-//            if("GET".equalsIgnoreCase(method)){
-//                params  =  request.getQueryString();
-//            }else if("POST".equalsIgnoreCase(method)){
-//                params = wrapper.getBody();
-//            }
-//            log.info("params:{}", params);
-//            String sign = request.getHeader("SIGN");
-//            String nonce = request.getHeader("NONCE");
-//            String timestamp = request.getHeader("TIMESTAMP");
-//            String aesPhone = request.getHeader("PHONE");
-//            String openid = request.getHeader("OPENID");
-//            log.info("aesPhone:{}, signKey:{}", aesPhone, signKey);
-//            String phone = AESDecryptor.decrypt(aesPhone, signKey);
-//            String plaintextOpenid = AESDecryptor.decrypt(openid, signKey);
-//            String md5Value = phone + Md5Utils.md5(Md5Utils.md5(plaintextOpenid));
-//            log.info("sign:{}, nonce:{}, timestamp:{},aesPhone:{}, openid:{}, 解密后的手机号:{}, md5Value:{}, 明文plaintextOpenid:{}",
-//                    sign, nonce, timestamp, aesPhone, openid, phone, md5Value, plaintextOpenid);
-//            String signStr = timestamp + nonce + params + signKey + md5Value;
-//            String newSign = Sha1Utils.getSha1(signStr.getBytes());
-//            log.info("signStr: {}, newSign: {}", signStr, newSign);
-//            // 前后端验签不等
-//            if (!newSign.equals(sign)) {
-//                response.setStatus(HttpStatus.OK.value());
-//                response.setContentType("application/json;charset=UTF-8");
-//                response.getWriter().write(JSON.toJSONString(ResponseResult.fail(ErrorCodeEnum.SIGN_FAIL)));
-//                return;
-//            }
-//            PartnerUserInfoVO partnerUserInfoVO = wechatMiniAppService.getUserInfo(phone, plaintextOpenid);
-//            if(partnerUserInfoVO != null){
-//                userStr = JSONObject.toJSONString(partnerUserInfoVO);
-//                log.info("url:{}, userStr:{}", uri, userStr);
-//            }
-//        }
-//        try {
-//            PartnerUserHolder.setUser(userStr);
-//            filterChain.doFilter(servletRequest, servletResponse);
-//        } finally {
-//            PartnerUserHolder.removeUser();
-//            MDC.clear();
-//        }
+        MDC.put(CommonConstants.REQUEST_ID, UUIDUtils.get32UUID());
+        HttpServletResponse response = (HttpServletResponse) servletResponse;
+        HttpServletRequest request = (HttpServletRequest) servletRequest;
+        CustomHttpServletRequestWrapper wrapper = (CustomHttpServletRequestWrapper) request;
+        String uri = request.getRequestURI();
+        String method = request.getMethod();
+        String userStr = "";
+        boolean isInWhiteList = excludePath(uri);
+        log.info("url:{}", uri);
+        if ( !isInWhiteList && !method.equals("OPTIONS")) {
+            String params = "";
+            if("GET".equalsIgnoreCase(method)){
+                params  =  request.getQueryString();
+            }else if("POST".equalsIgnoreCase(method)){
+                params = wrapper.getBody();
+            }
+            log.info("params:{}", params);
+            String sign = request.getHeader("SIGN");
+            String nonce = request.getHeader("NONCE");
+            String timestamp = request.getHeader("TIMESTAMP");
+            String aesPhone = request.getHeader("PHONE");
+            String openid = request.getHeader("OPENID");
+            log.info("aesPhone:{}, signKey:{}", aesPhone, signKey);
+            String phone = AESDecryptor.decrypt(aesPhone, signKey);
+            String plaintextOpenid = AESDecryptor.decrypt(openid, signKey);
+            String md5Value = phone + Md5Utils.md5(Md5Utils.md5(plaintextOpenid));
+            log.info("sign:{}, nonce:{}, timestamp:{},aesPhone:{}, openid:{}, 解密后的手机号:{}, md5Value:{}, 明文plaintextOpenid:{}",
+                    sign, nonce, timestamp, aesPhone, openid, phone, md5Value, plaintextOpenid);
+            String signStr = timestamp + nonce + params + signKey + md5Value;
+            String newSign = Sha1Utils.getSha1(signStr.getBytes());
+            log.info("signStr: {}, newSign: {}", signStr, newSign);
+            // 前后端验签不等
+            if (!newSign.equals(sign)) {
+                response.setStatus(HttpStatus.OK.value());
+                response.setContentType("application/json;charset=UTF-8");
+                response.getWriter().write(JSON.toJSONString(ResponseResult.fail(ErrorCodeEnum.SIGN_FAIL)));
+                return;
+            }
+            PartnerUserInfoVO partnerUserInfoVO = wechatMiniAppService.getUserInfo(phone, plaintextOpenid);
+            if(partnerUserInfoVO != null){
+                userStr = JSONObject.toJSONString(partnerUserInfoVO);
+                log.info("url:{}, userStr:{}", uri, userStr);
+            }
+        }
+        try {
+            PartnerUserHolder.setUser(userStr);
+            filterChain.doFilter(servletRequest, servletResponse);
+        } finally {
+            PartnerUserHolder.removeUser();
+            MDC.clear();
+        }
    }

    @Override
--- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/ContentController.java
+++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/ContentController.java
@@ -0,0 +1,43 @@
+package com.cool.store.controller;
+
+import com.cool.store.dto.content.ContentQueryDetailDto;
+import com.cool.store.dto.content.ContentQueryListDto;
+import com.cool.store.entity.HyContentInfoDO;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.ContentService;
+import com.cool.store.vo.HyContentInfoVO;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("news")
+@Api(tags = "动态")
+@Slf4j
+public class ContentController {
+
+    @Autowired
+    private ContentService contentService;
+
+    @PostMapping("/queryContentList")
+    @ApiOperation("查询动态列表")
+    public ResponseResult<PageInfo<HyContentInfoVO>> queryContentList(@RequestBody ContentQueryListDto dto) {
+        PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+        List<HyContentInfoVO> list = contentService.queryContentListToC(dto);
+        PageInfo<HyContentInfoVO> page = new PageInfo<>(list);
+        return ResponseResult.success(page);
+    }
+
+    @PostMapping("/detail")
+    @ApiOperation("动态详情")
+    public ResponseResult<HyContentInfoDO> queryContentInfo(@RequestBody ContentQueryDetailDto dto) {
+        return ResponseResult.success(contentService.queryContentInfo(dto.getContentId()));
+    }
+
+}
--- a/coolstore-partner-webc/src/main/resources/application-ab.properties
+++ b/coolstore-partner-webc/src/main/resources/application-ab.properties
@@ -0,0 +1,85 @@
+
+#mysql config
+default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_hy?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true
+default.datasource.username=hsay
+default.datasource.password=Z3J7xBbgouMD
+
+#redis
+spring.redis.host=tstore-coolcollege.redis.rds.aliyuncs.com
+spring.redis.port=6379
+spring.redis.password=Cx111111
+spring.redis.database=0
+spring.redis.timeout=2000ms
+spring.redis.lettuce.pool.max-wait=100ms
+spring.redis.lettuce.pool.max-active=1024
+spring.redis.lettuce.pool.max-idle=200
+spring.redis.lettuce.pool.min-idle=0
+spring.redis.lettuce.shutdown-timeout=100ms
+redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/0
+redis.isv.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/2
+
+#pagehelper
+pagehelper.helper-dialect=mysql
+pagehelper.reasonable=false
+pagehelper.returnPageInfo=check
+pagehelper.support-methods-arguments=false
+pagehelper.params=count=countSql
+pagehelper.page-size-zero=true
+
+spring.mvc.async.request-timeout=60000
+
+# mybatis config
+mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml
+
+mybatis.configuration.call-setters-on-nulls=true
+mybatis.configuration.map-underscore-to-camel-case=true
+
+isv.domain=https://abstore-isv.coolstore.cn/isv
+
+#rocketmq \u914D\u7F6E
+rocketmq.accessKey=zK2oVEz4G1ts23d2
+rocketmq.secretKey=0UstLCS0mh2ASgBh
+rocketmq.nameSrvAdder=http://rmq-cn-9lb38l1rx04.cn-hangzhou.rmq.aliyuncs.com:8080
+rocketmq.topic=simple_message
+
+#oss配置
+oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur
+oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2
+oss.endpoint=oss-cn-hangzhou.aliyuncs.com
+oss.bucket=cool-store-hsay
+oss.file.dir=partner/171cddee76471740/
+oss.excelFile.dir=lineExcel/
+
+#企业corpId
+corp.id=171cddee76471740
+#cdn地址
+cdn.url=https://testhsaypic.coolstore.cn
+
+#TRTC
+trtc.sdkAppId=1400811820
+trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
+
+weixin.appId=wx997f2206e276e513
+weixin.appSecret=90a51574dde00480316f81a552e6b5cb
+
+signKey=77fea013c3a6459685b83c21a2fc3411
+fixMobileOpenid=HSAY5531DA7
+
+#飞书通知
+feishu.notice.link.url=https://applink.feishu.cn/client/web_app/open?appId=cli_a4f3e24dc73a100c&lk_target_url=https%3A%2F%2Ftest-hsay-web.coolstore.cn%2F%23%2Fwork%2Fbench
+feishu.notice.link.url.mobile=https://test-hsay-web.coolstore.cn/#/mobile
+
+#阿里云ak sk
+aliyun.accessKeyId=LTAI5t9RaXvABZbHvoXjDFJ1
+aliyun.accessKeySecret=zhOK7WWo3yGoUWkOMaatty19k25CMd
+aliyun.authCode=Y81FVZepk6
+
+exhibition.channel.id=52399
+recommended.channel.id=52400
+manual.channel.id=52403
+
+ec.sync.createUserId=ou_18d7526a527a30a06ee99205ad983f3f
+
+#沪上阿姨事件中心地址
+hsay.event.url=https://oapi-gateway.shpr.top/event
+hsay.event.systemsource=hsay_test
--- a/coolstore-partner-webc/src/main/resources/application-local.properties
+++ b/coolstore-partner-webc/src/main/resources/application-local.properties
@@ -0,0 +1,85 @@
+
+#mysql config
+default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_hy?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true
+default.datasource.username=hsay
+default.datasource.password=Z3J7xBbgouMD
+
+#redis
+spring.redis.host=tstore-coolcollege.redis.rds.aliyuncs.com
+spring.redis.port=6379
+spring.redis.password=Cx111111
+spring.redis.database=0
+spring.redis.timeout=2000ms
+spring.redis.lettuce.pool.max-wait=100ms
+spring.redis.lettuce.pool.max-active=1024
+spring.redis.lettuce.pool.max-idle=200
+spring.redis.lettuce.pool.min-idle=0
+spring.redis.lettuce.shutdown-timeout=100ms
+redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/0
+redis.isv.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/2
+
+#pagehelper
+pagehelper.helper-dialect=mysql
+pagehelper.reasonable=false
+pagehelper.returnPageInfo=check
+pagehelper.support-methods-arguments=false
+pagehelper.params=count=countSql
+pagehelper.page-size-zero=true
+
+spring.mvc.async.request-timeout=60000
+
+# mybatis config
+mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml
+
+mybatis.configuration.call-setters-on-nulls=true
+mybatis.configuration.map-underscore-to-camel-case=true
+
+isv.domain=https://abstore-isv.coolstore.cn/isv
+
+#rocketmq \u914D\u7F6E
+rocketmq.accessKey=zK2oVEz4G1ts23d2
+rocketmq.secretKey=0UstLCS0mh2ASgBh
+rocketmq.nameSrvAdder=http://rmq-cn-9lb38l1rx04.cn-hangzhou.rmq.aliyuncs.com:8080
+rocketmq.topic=simple_message
+
+#oss配置
+oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur
+oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2
+oss.endpoint=oss-cn-hangzhou.aliyuncs.com
+oss.bucket=cool-store-hsay
+oss.file.dir=partner/171cddee76471740/
+oss.excelFile.dir=lineExcel/
+
+#企业corpId
+corp.id=171cddee76471740
+#cdn地址
+cdn.url=https://testhsaypic.coolstore.cn
+
+#TRTC
+trtc.sdkAppId=1400811820
+trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
+
+weixin.appId=wx997f2206e276e513
+weixin.appSecret=90a51574dde00480316f81a552e6b5cb
+
+signKey=77fea013c3a6459685b83c21a2fc3411
+fixMobileOpenid=HSAY5531DA7
+
+#飞书通知
+feishu.notice.link.url=https://applink.feishu.cn/client/web_app/open?appId=cli_a4f3e24dc73a100c&lk_target_url=https%3A%2F%2Ftest-hsay-web.coolstore.cn%2F%23%2Fwork%2Fbench
+feishu.notice.link.url.mobile=https://test-hsay-web.coolstore.cn/#/mobile
+
+#阿里云ak sk
+aliyun.accessKeyId=LTAI5t9RaXvABZbHvoXjDFJ1
+aliyun.accessKeySecret=zhOK7WWo3yGoUWkOMaatty19k25CMd
+aliyun.authCode=Y81FVZepk6
+
+exhibition.channel.id=52399
+recommended.channel.id=52400
+manual.channel.id=52403
+
+ec.sync.createUserId=ou_18d7526a527a30a06ee99205ad983f3f
+
+#沪上阿姨事件中心地址
+hsay.event.url=https://oapi-gateway.shpr.top/event
+hsay.event.systemsource=hsay_test
--- a/coolstore-partner-webc/src/main/resources/application-online.properties
+++ b/coolstore-partner-webc/src/main/resources/application-online.properties
@@ -0,0 +1,108 @@
+
+#mysql config
+default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_hy?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true
+default.datasource.username=hsay
+default.datasource.password=Z3J7xBbgouMD
+
+#redis
+spring.redis.host=tstore-coolcollege.redis.rds.aliyuncs.com
+spring.redis.port=6379
+spring.redis.password=Cx111111
+spring.redis.database=0
+spring.redis.timeout=2000ms
+spring.redis.lettuce.pool.max-wait=100ms
+spring.redis.lettuce.pool.max-active=1024
+spring.redis.lettuce.pool.max-idle=200
+spring.redis.lettuce.pool.min-idle=0
+spring.redis.lettuce.shutdown-timeout=100ms
+redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/0
+redis.isv.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/2
+
+#pagehelper
+pagehelper.helper-dialect=mysql
+pagehelper.reasonable=false
+pagehelper.returnPageInfo=check
+pagehelper.support-methods-arguments=false
+pagehelper.params=count=countSql
+pagehelper.page-size-zero=true
+
+spring.mvc.async.request-timeout=60000
+
+# mybatis config
+mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml
+
+mybatis.configuration.call-setters-on-nulls=true
+mybatis.configuration.map-underscore-to-camel-case=true
+
+isv.domain=https://abstore-isv.coolstore.cn/isv
+
+#rocketmq \u914D\u7F6E
+rocketmq.accessKey=zK2oVEz4G1ts23d2
+rocketmq.secretKey=0UstLCS0mh2ASgBh
+rocketmq.nameSrvAdder=http://rmq-cn-9lb38l1rx04.cn-hangzhou.rmq.aliyuncs.com:8080
+rocketmq.topic=simple_message
+
+#oss配置
+oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur
+oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2
+oss.endpoint=oss-cn-hangzhou.aliyuncs.com
+oss.bucket=cool-store-hsay
+oss.file.dir=partner/171cddee76471740/
+oss.excelFile.dir=lineExcel/
+
+#企业corpId
+corp.id=171cddee76471740
+#cdn地址
+cdn.url=https://testhsaypic.coolstore.cn
+
+#TRTC
+trtc.sdkAppId=1400811820
+trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
+trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8
+
+weixin.appId=wx997f2206e276e513
+weixin.appSecret=90a51574dde00480316f81a552e6b5cb
+weixin.index.url=pages/index/index
+
+signKey=77fea013c3a6459685b83c21a2fc3411
+fixMobileOpenid=HSAY5531DA7
+#xxljob配置
+#xxljob配置
+xxl.job.admin.addresses=http://10.7.53.224:10001/xxl-job-admin
+xxl.job.executor.appname=${spring.application.name}
+xxl.job.executor.ip=
+xxl.job.executor.port=31001
+xxl.job.executor.logpath=logs/xxl-job/jobhandler
+xxl.job.executor.logretentiondays=3
+xxl.job.accessToken=25365115eed84e9ba5e0040abb255a09
+
+
+hs.mdm.baseUrl=http://36.7.115.86:10112
+hs.mdm.appkey=HSAYPartner
+hs.mdm.appsec=ab39fedb886fa3587c7f517551976de8b2606f5511fd8f8675266825d74c5cd3
+
+#sms
+hs.sms.accessKeyId=LTAI5tPWCTeCyngfYLqoSGWk
+hs.sms.accessKeySecret=jkzIXlvNF17ne5TPPEFP1sQhcfg4Je
+
+ec.baseUrl=https://oapi-gateway.shpr.top/basic
+
+#飞书通知
+feishu.notice.link.url=https://applink.feishu.cn/client/web_app/open?appId=cli_a4f3e24dc73a100c&lk_target_url=https%3A%2F%2Ftest-hsay-web.coolstore.cn%2F%23%2Fwork%2Fbench
+feishu.notice.link.url.mobile=https://test-hsay-web.coolstore.cn/#/mobile
+
+#阿里云ak sk
+aliyun.accessKeyId=LTAI5t9RaXvABZbHvoXjDFJ1
+aliyun.accessKeySecret=zhOK7WWo3yGoUWkOMaatty19k25CMd
+aliyun.authCode=Y81FVZepk6
+
+exhibition.channel.id=52399
+recommended.channel.id=52400
+manual.channel.id=52403
+sms.invate.channel.id=46930
+
+ec.sync.createUserId=ou_18d7526a527a30a06ee99205ad983f3f
+
+#沪上阿姨事件中心地址
+hsay.event.url=https://oapi-gateway.shpr.top/event
+hsay.event.systemsource=hsay_test
--- a/coolstore-partner-webc/src/main/resources/application-test.properties
+++ b/coolstore-partner-webc/src/main/resources/application-test.properties
@@ -0,0 +1,85 @@
+
+#mysql config
+default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_hy?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true
+default.datasource.username=hsay
+default.datasource.password=Z3J7xBbgouMD
+
+#redis
+spring.redis.host=tstore-coolcollege.redis.rds.aliyuncs.com
+spring.redis.port=6379
+spring.redis.password=Cx111111
+spring.redis.database=0
+spring.redis.timeout=2000ms
+spring.redis.lettuce.pool.max-wait=100ms
+spring.redis.lettuce.pool.max-active=1024
+spring.redis.lettuce.pool.max-idle=200
+spring.redis.lettuce.pool.min-idle=0
+spring.redis.lettuce.shutdown-timeout=100ms
+redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/0
+redis.isv.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/2
+
+#pagehelper
+pagehelper.helper-dialect=mysql
+pagehelper.reasonable=false
+pagehelper.returnPageInfo=check
+pagehelper.support-methods-arguments=false
+pagehelper.params=count=countSql
+pagehelper.page-size-zero=true
+
+spring.mvc.async.request-timeout=60000
+
+# mybatis config
+mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml
+
+mybatis.configuration.call-setters-on-nulls=true
+mybatis.configuration.map-underscore-to-camel-case=true
+
+isv.domain=https://abstore-isv.coolstore.cn/isv
+
+#rocketmq \u914D\u7F6E
+rocketmq.accessKey=zK2oVEz4G1ts23d2
+rocketmq.secretKey=0UstLCS0mh2ASgBh
+rocketmq.nameSrvAdder=http://rmq-cn-9lb38l1rx04.cn-hangzhou.rmq.aliyuncs.com:8080
+rocketmq.topic=simple_message
+
+#oss配置
+oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur
+oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2
+oss.endpoint=oss-cn-hangzhou.aliyuncs.com
+oss.bucket=cool-store-hsay
+oss.file.dir=partner/171cddee76471740/
+oss.excelFile.dir=lineExcel/
+
+#企业corpId
+corp.id=171cddee76471740
+#cdn地址
+cdn.url=https://testhsaypic.coolstore.cn
+
+#TRTC
+trtc.sdkAppId=1400811820
+trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
+
+weixin.appId=wx997f2206e276e513
+weixin.appSecret=90a51574dde00480316f81a552e6b5cb
+
+signKey=77fea013c3a6459685b83c21a2fc3411
+fixMobileOpenid=HSAY5531DA7
+
+#飞书通知
+feishu.notice.link.url=https://applink.feishu.cn/client/web_app/open?appId=cli_a4f3e24dc73a100c&lk_target_url=https%3A%2F%2Ftest-hsay-web.coolstore.cn%2F%23%2Fwork%2Fbench
+feishu.notice.link.url.mobile=https://test-hsay-web.coolstore.cn/#/mobile
+
+#阿里云ak sk
+aliyun.accessKeyId=LTAI5t9RaXvABZbHvoXjDFJ1
+aliyun.accessKeySecret=zhOK7WWo3yGoUWkOMaatty19k25CMd
+aliyun.authCode=Y81FVZepk6
+
+exhibition.channel.id=52399
+recommended.channel.id=52400
+manual.channel.id=52403
+
+ec.sync.createUserId=ou_18d7526a527a30a06ee99205ad983f3f
+
+#沪上阿姨事件中心地址
+hsay.event.url=https://oapi-gateway.shpr.top/event
+hsay.event.systemsource=hsay_test
--- a/coolstore-partner-webc/src/main/resources/application.properties
+++ b/coolstore-partner-webc/src/main/resources/application.properties
@@ -1,7 +1,8 @@
-spring.application.name=hsay-partner-webc
-spring.profiles.active=dev
-server.port=30900
-server.servlet.context-path=/partner/mini/program
+spring.application.name=hsay-partner-webb
+spring.profiles.active=test
+
+server.port=31000
+server.servlet.context-path=/partner/pc

 #logback
 logging.config=classpath:logback-spring.xml
--- a/coolstore-partner-webc/src/main/resources/bootstrap-dev.properties
+++ b/coolstore-partner-webc/src/main/resources/bootstrap-dev.properties
@@ -1,3 +0,0 @@
-spring.cloud.nacos.discovery.server-addr=121.41.41.92
-spring.cloud.nacos.config.server-addr=121.41.41.92
-spring.cloud.nacos.config.file-extension=properties
--- a/coolstore-partner-webc/src/main/resources/bootstrap-pre.properties
+++ b/coolstore-partner-webc/src/main/resources/bootstrap-pre.properties
@@ -1,11 +0,0 @@
-#spring.cloud.nacos.discovery.server-addr=10.0.0.192:8848
-#spring.cloud.nacos.config.server-addr=10.0.0.192:8848
-#spring.cloud.nacos.config.file-extension=properties
-#spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122
-#spring.cloud.nacos.discovery.server-addr=120.92.151.10:8848
-#spring.cloud.nacos.config.server-addr=120.92.151.10:8848
-#spring.cloud.nacos.config.file-extension=properties
-#spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122
-spring.cloud.nacos.discovery.server-addr=121.41.41.92
-spring.cloud.nacos.config.server-addr=121.41.41.92
-spring.cloud.nacos.config.file-extension=properties