招商基础

2024-03-07 11:33:54 +08:00
parent c0789d6932
commit 32942b5da9
75 changed files with 5001 additions and 179 deletions
--- a/coolstore-partner-webb/pom.xml
+++ b/coolstore-partner-webb/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-webb/src/main/java/com/cool/store/PartnerBWebApplication.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/PartnerBWebApplication.java
@@ -5,7 +5,6 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -19,7 +18,6 @@ import javax.sql.DataSource;
 * @Description: C端web层
 * @date 2023-05-17 11:28
 */
-@EnableDiscoveryClient
@SpringBootApplication
@EnableAsync
@MapperScan("com.cool.store.mapper")
--- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java
@@ -0,0 +1,72 @@
+package com.cool.store.controller;
+
+import com.cool.store.dto.content.*;
+import com.cool.store.entity.HyContentInfoDO;
+import com.cool.store.exception.ApiException;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("news")
+@Api(tags = "动态")
+@Slf4j
+public class ContentController {
+
+    @Autowired
+    private ContentService contentService;
+
+    @PostMapping("/queryTitles")
+    @ApiOperation("搜索标题是否重复")
+    public ResponseResult<Boolean> queryTitles(@RequestBody ContentQueryTitlesDto title) {
+        return ResponseResult.success(contentService.queryTitles(title.getTitle()));
+    }
+
+    @PostMapping("/add")
+    @ApiOperation("新增动态")
+    public ResponseResult<String> addContent(@RequestBody ContentAddDto dto) throws ApiException {
+        return ResponseResult.success(contentService.addNews(dto));
+    }
+
+    @PostMapping("/delete")
+    @ApiOperation("删除动态")
+    public ResponseResult deleteContent(@RequestBody ContentDelDto dto) {
+        contentService.deleteContent(dto.getContentId());
+        return ResponseResult.success();
+    }
+
+    @PostMapping("/modify")
+    @ApiOperation("修改动态")
+    public ResponseResult updateContent(@RequestBody ContentUpdateDto dto) throws ApiException {
+        contentService.updateContent(dto);
+        return ResponseResult.success();
+    }
+
+    @PostMapping("/queryContentList")
+    @ApiOperation("查询动态列表")
+    public ResponseResult<PageInfo<HyContentInfoVO>> queryContentList(@RequestBody ContentQueryListDto dto) {
+        PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+        List<HyContentInfoVO> list = contentService.queryContentList(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-webb/src/main/java/com/cool/store/controller/LabelController.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelController.java
@@ -0,0 +1,69 @@
+package com.cool.store.controller;
+
+import com.cool.store.dto.label.LabelAddDTO;
+import com.cool.store.dto.label.LabelDeleteDTO;
+import com.cool.store.dto.label.LabelListDTO;
+import com.cool.store.dto.label.LabelUpdateDTO;
+import com.cool.store.exception.ApiException;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.LabelService;
+import com.cool.store.vo.LabelGroupVO;
+import com.cool.store.vo.LabelListVo;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author Fun Li 2023/8/10 14:20
+ * @version 1.0
+ */
+@Api(tags = "标签管理")
+@RestController
+@RequestMapping("/label")
+public class LabelController {
+
+    @Autowired
+    private LabelService labelService;
+
+    @ApiOperation("标签列表查询")
+    @PostMapping("/list")
+    public ResponseResult<PageInfo<LabelListVo>> getLabelList(@RequestBody LabelListDTO dto) {
+        PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+        List<LabelListVo> result = labelService.getLabelList(dto);
+        return ResponseResult.success(new PageInfo<>(result));
+    }
+
+    @ApiOperation("查询标签组及子标签列表")
+    @GetMapping("/labelGroupAndLabelList")
+    public ResponseResult<List<LabelGroupVO>> getAllLabelList() {
+        List<LabelGroupVO> result = labelService.getAllGroupAndLabelList();
+        return ResponseResult.success(result);
+    }
+
+    @ApiOperation("新增标签")
+    @PostMapping("/add")
+    public ResponseResult addLabel(@RequestBody LabelAddDTO dto) throws ApiException {
+        labelService.addLabel(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("修改标签")
+    @PostMapping("/edit")
+    public ResponseResult updateLabel(@RequestBody LabelUpdateDTO dto) throws ApiException {
+        labelService.updateLabel(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("删除标签")
+    @PostMapping("/delete")
+    public ResponseResult deleteLabel(@RequestBody LabelDeleteDTO dto) {
+        labelService.deleteLabel(dto);
+        return ResponseResult.success();
+    }
+
+}
--- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelGroupController.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelGroupController.java
@@ -0,0 +1,75 @@
+package com.cool.store.controller;
+
+import com.cool.store.dto.label.LabelGroupAddDTO;
+import com.cool.store.dto.label.LabelGroupDeleteDTO;
+import com.cool.store.dto.label.LabelGroupListDTO;
+import com.cool.store.dto.label.LabelGroupUpdateDTO;
+import com.cool.store.exception.ApiException;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.LabelGroupService;
+import com.cool.store.vo.LabelGroupListVo;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author Fun Li 2023/8/10 10:54
+ * @version 1.0
+ */
+@Api(tags = {"标签组管理"})
+@RestController
+@RequestMapping({"/labelGroup"})
+public class LabelGroupController {
+    @Autowired
+    private LabelGroupService labelGroupService;
+
+    @ApiOperation("标签组分页查询")
+    @PostMapping({"/list"})
+    public ResponseResult<PageInfo<LabelGroupListVo>> getLabelGroupList(@RequestBody LabelGroupListDTO dto) {
+        PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+        List<LabelGroupListVo> result = labelGroupService.getLabelGroupList(dto);
+        return ResponseResult.success(new PageInfo<>(result));
+    }
+
+    @ApiOperation("新增标签组")
+    @PostMapping({"/add"})
+    public ResponseResult addLabelGroup(@RequestBody LabelGroupAddDTO dto) throws ApiException {
+        labelGroupService.addLabelGroup(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("修改标签组")
+    @PostMapping({"/edit"})
+    public ResponseResult updateLabelGroup(@RequestBody LabelGroupUpdateDTO dto) throws ApiException {
+        labelGroupService.updateLabelGroup(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("删除标签组")
+    @PostMapping({"/delete"})
+    public ResponseResult deleteLabelGroup(@RequestBody LabelGroupDeleteDTO dto) throws ApiException {
+        labelGroupService.deleteLabelGroup(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("获取所有标签组")
+    @PostMapping({"/allList"})
+    public ResponseResult<List<LabelGroupListVo>> deleteLabelGroup() {
+        return ResponseResult.success(labelGroupService.getAllLabelGroupList());
+    }
+
+    @ApiOperation("获取所有标签组")
+    @PostMapping({"/allListAsc"})
+    public ResponseResult<List<LabelGroupListVo>> getLabelGroupListOrder() {
+        return ResponseResult.success(labelGroupService.getLabelGroupListOrder());
+    }
+}
+
--- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/OpenAreaController.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/OpenAreaController.java
@@ -0,0 +1,69 @@
+package com.cool.store.controller;
+
+import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.request.OpenAreaRequest;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.OpenAreaService;
+import com.cool.store.vo.OpenAreaTreeVO;
+import com.cool.store.vo.OpenAreaVO;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2023/6/15 9:49
+ * @Version 1.0
+ */
+@RestController
+public class OpenAreaController {
+
+    @Resource
+    OpenAreaService openAreaService;
+
+    @GetMapping(path = "/getOpenAreaTree")
+    @ApiOperation("开放城市树-搜索城市 到第二节点")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "keyword", value = "搜索关键字", required = false),
+            @ApiImplicitParam(name = "areaStatus", value = "状态 open-开放 keyOpen-重点开放 notOpen-未开放 saturated-已饱和", required = false)
+    })
+    public ResponseResult<List<OpenAreaTreeVO>> getOpenAreaTree(@RequestParam(value = "keyword",required = false)String keyword,
+                                                                @RequestParam(value = "areaStatus",required = false)String areaStatus){
+        return  ResponseResult.success(openAreaService.queryByKeyword(keyword,areaStatus,Boolean.TRUE));
+    }
+
+
+    @GetMapping(path = "/getAllOpenAreaTree")
+    @ApiOperation("开放城市树-所有节点")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "keyword", value = "搜索关键字", required = false)
+    })
+    public ResponseResult<List<OpenAreaTreeVO>> getAllOpenAreaTree(@RequestParam(value = "keyword",required = false)String keyword){
+        return  ResponseResult.success(openAreaService.queryAllOpenAreaByKeyword(keyword,null,Boolean.FALSE));
+    }
+
+
+    @GetMapping(path = "/getOpenAreaList")
+    @ApiOperation("开放城市树-子列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "parentId", value = "父区域名称", required = false),
+            @ApiImplicitParam(name = "type", value = "可预约-reservation  可申请-apply ", required = false)
+    })
+    public ResponseResult<List<OpenAreaVO>> getOpenAreaList(@RequestParam(value = "parentId",required = false)Long parentId,
+                                                            @RequestParam(value = "type",required = false)String type){
+        return  ResponseResult.success(openAreaService.getChildrenList(type,parentId));
+    }
+
+
+
+    @PostMapping(path = "/changeOpenAreaStatus")
+    @ApiOperation("变更开放区域状态")
+    public ResponseResult<Boolean> changeOpenAreaStatus(@RequestBody OpenAreaRequest openAreaRequest){
+        String userId = CurrentUserHolder.getUserId();
+        return ResponseResult.success(openAreaService.batchUpdate( userId, openAreaRequest));
+    }
+}
--- a/coolstore-partner-webb/src/main/resources/application-ab.properties
+++ b/coolstore-partner-webb/src/main/resources/application-ab.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-webb/src/main/resources/application-local.properties
+++ b/coolstore-partner-webb/src/main/resources/application-local.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-webb/src/main/resources/application-online.properties
+++ b/coolstore-partner-webb/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-webb/src/main/resources/application-test.properties
+++ b/coolstore-partner-webb/src/main/resources/application-test.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-webb/src/main/resources/application.properties
+++ b/coolstore-partner-webb/src/main/resources/application.properties
--- a/coolstore-partner-webb/src/main/resources/bootstrap-dev.properties
+++ b/coolstore-partner-webb/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-webb/src/main/resources/bootstrap-pre.properties
+++ b/coolstore-partner-webb/src/main/resources/bootstrap-pre.properties
@@ -1,13 +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=192.168.1.137:8848
-#spring.cloud.nacos.config.server-addr=192.168.1.137: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