企业初始化

2023-05-29 14:08:05 +08:00
parent 10ea204bfd
commit 112d874931
54 changed files with 1915 additions and 62 deletions
--- a/coolstore-partner-webb/coolstore-partner-webb.iml
+++ b/coolstore-partner-webb/coolstore-partner-webb.iml
@@ -23,6 +23,16 @@
    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.0.7" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.4.6" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.4.6" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.5" level="project" />
+    <orderEntry type="library" name="Maven: com.coolstore:coolstore-base:1.5.3" level="project" />
    <orderEntry type="module" module-name="coolstore-partner-dao" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:3.0.2" level="project" />
    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
@@ -32,14 +42,6 @@
    <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.20" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.20" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.4.6" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.4.6" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.5" level="project" />
    <orderEntry type="module" module-name="coolstore-partner-model" />
    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-starter:2.0.4" level="project" />
    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.4" level="project" />
@@ -64,6 +66,25 @@
    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-ui:2.0.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.2.3" level="project" />
    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun.openservices:ons-client:1.8.8.3.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.0.19" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.12" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
+    <orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.3" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.1.9" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.65" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.65" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea:1.2.7" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.7" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:ons20190214:1.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:endpoint-util:0.0.6" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.6.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.6.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.6.RELEASE" level="project" />
--- a/coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java
@@ -40,7 +40,7 @@ public class TokenValidateFilter implements Filter {

    private static List<String> patternList =

-            Lists.newArrayList("/web/check/ok","/check/ok", "/partner/doc.html",
+            Lists.newArrayList("/web/check/ok","/check/ok", "/partner/doc.html","/**/test/**",
                    "/**/swagger*/**",
                    "/**/webjars/**");

--- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LoginController.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/LoginController.java
@@ -3,6 +3,7 @@ package com.cool.store.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.cool.store.dto.login.FeiShuLoginDTO;
+import com.cool.store.dto.login.UserIdInfoDTO;
 import com.cool.store.enums.AppTypeEnum;
 import com.cool.store.enums.ErrorCodeEnum;
 import com.cool.store.exception.ServiceException;
@@ -42,17 +43,13 @@ public class LoginController {
        String userId = "", corpId = "", appType = AppTypeEnum.FEI_SHU.getValue();
        try {
            String value = "code=" + code + "&appType=" + appType + "&appId=" + appId;
-            JSONObject userInfo = isvHttpRequest.getUserIdByCode(value);
+            UserIdInfoDTO userInfo = isvHttpRequest.getUserIdByCode(value);
            if(Objects.isNull(userInfo)){
                throw new ServiceException(ErrorCodeEnum.LOGIN_ERROR);
            }
            log.info("userInfo:{}", JSONObject.toJSONString(userInfo));
-            userId = userInfo.getString("openId");
-            corpId = userInfo.getString("corpId");
-            String errorCode = userInfo.getString("error_code");
-            if (StringUtils.isBlank(userId) && StringUtils.isNotBlank(errorCode)) {
-                throw new ServiceException(ErrorCodeEnum.LOGIN_ERROR);
-            }
+            userId = userInfo.getOpenId();
+            corpId = userInfo.getCorpId();
            return loginService.feiShuLogin(userId, corpId, Boolean.TRUE, appType, StringUtils.EMPTY);
        } catch (ServiceException e) {
            log.error(e.getMessage(), e);
--- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java
@@ -0,0 +1,30 @@
+package com.cool.store.controller;
+
+import com.cool.store.entity.EnterpriseConfigDO;
+import com.cool.store.service.EnterpriseConfigService;
+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 javax.annotation.Resource;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: TestController
+ * @Description:
+ * @date 2023-05-26 11:32
+ */
+@RestController
+@RequestMapping("test/")
+public class TestController {
+
+    @Resource
+    private EnterpriseConfigService enterpriseConfigService;
+
+    @GetMapping("/selectByEnterpriseId")
+    public EnterpriseConfigDO selectByEnterpriseId(@RequestParam("enterpriseId") String enterpriseId){
+        return enterpriseConfigService.selectByEnterpriseId(enterpriseId);
+    }
+
+}
--- a/coolstore-partner-webb/src/main/resources/application-ab.properties
+++ b/coolstore-partner-webb/src/main/resources/application-ab.properties
@@ -34,4 +34,10 @@ mybatis.configuration.call-setters-on-nulls=true
 mybatis.configuration.map-underscore-to-camel-case=true

 isv.domain = https://tstore-isv.coolcollege.cn
-get.user.id.by.code = /isv/v2/get_user_id_by_code
+
+#rocketmq \u914D\u7F6E
+rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2
+rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig
+rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX3sLZnA.cn-hangzhou.mq-internal.aliyuncs.com:8080
+rocketmq.topic=simple_message
+rocketmq.orderTopic=order_message
--- a/coolstore-partner-webb/src/main/resources/application-dev.properties
+++ b/coolstore-partner-webb/src/main/resources/application-dev.properties
@@ -38,4 +38,10 @@ mybatis.configuration.call-setters-on-nulls=true
 mybatis.configuration.map-underscore-to-camel-case=true

 isv.domain = https://dstore-isv.coolcollege.cn
-get.user.id.by.code = /isv/v2/get_user_id_by_code
+
+#rocketmq \u914D\u7F6E
+rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2
+rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig
+rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX3sLZnA.cn-hangzhou.mq-internal.aliyuncs.com:8080
+rocketmq.topic=simple_message
+rocketmq.orderTopic=order_message
--- a/coolstore-partner-webb/src/main/resources/application-hd.properties
+++ b/coolstore-partner-webb/src/main/resources/application-hd.properties
@@ -34,4 +34,10 @@ mybatis.configuration.call-setters-on-nulls=true
 mybatis.configuration.map-underscore-to-camel-case=true

 isv.domain = https://hdstore-isv.coolcollege.cn
-get.user.id.by.code = /isv/v2/get_user_id_by_code
+
+#rocketmq \u914D\u7F6E
+rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2
+rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig
+rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-internal.aliyuncs.com:8080
+rocketmq.topic=simple_message
+rocketmq.orderTopic=order_message
--- a/coolstore-partner-webb/src/main/resources/application-local.properties
+++ b/coolstore-partner-webb/src/main/resources/application-local.properties
@@ -41,4 +41,10 @@ mybatis.configuration.call-setters-on-nulls=true
 mybatis.configuration.map-underscore-to-camel-case=true

 isv.domain = https://tstore-isv.coolcollege.cn
-get.user.id.by.code = /isv/v2/get_user_id_by_code
+
+#rocketmq \u914D\u7F6E
+rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2
+rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig
+rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX3sLZnA.cn-hangzhou.mq-internal.aliyuncs.com:8080
+rocketmq.topic=simple_message
+rocketmq.orderTopic=order_message
--- a/coolstore-partner-webb/src/main/resources/application-online.properties
+++ b/coolstore-partner-webb/src/main/resources/application-online.properties
@@ -34,4 +34,10 @@ mybatis.configuration.call-setters-on-nulls=true
 mybatis.configuration.map-underscore-to-camel-case=true

 isv.domain = https://store-isv.coolcollege.cn
-get.user.id.by.code = /isv/v2/get_user_id_by_code
+
+#rocketmq \u914D\u7F6E
+rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2
+rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig
+rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-internal.aliyuncs.com:8080
+rocketmq.topic=simple_message
+rocketmq.orderTopic=order_message
--- a/coolstore-partner-webb/src/main/resources/application-pre.properties
+++ b/coolstore-partner-webb/src/main/resources/application-pre.properties
@@ -34,4 +34,10 @@ mybatis.configuration.call-setters-on-nulls=true
 mybatis.configuration.map-underscore-to-camel-case=true

 isv.domain = https://store-isv.coolcollege.cn
-get.user.id.by.code = /isv/v2/get_user_id_by_code
+
+#rocketmq \u914D\u7F6E
+rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2
+rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig
+rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-internal.aliyuncs.com:8080
+rocketmq.topic=simple_message
+rocketmq.orderTopic=order_message
--- a/coolstore-partner-webb/src/main/resources/application-test.properties
+++ b/coolstore-partner-webb/src/main/resources/application-test.properties
@@ -34,4 +34,10 @@ mybatis.configuration.call-setters-on-nulls=true
 mybatis.configuration.map-underscore-to-camel-case=true

 isv.domain = https://tstore-isv.coolcollege.cn
-get.user.id.by.code = /isv/v2/get_user_id_by_code
+
+#rocketmq \u914D\u7F6E
+rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2
+rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig
+rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX3sLZnA.cn-hangzhou.mq-internal.aliyuncs.com:8080
+rocketmq.topic=simple_message
+rocketmq.orderTopic=order_message