diff --git 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 index 9f814156f..f86da1f54 100644 --- 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 @@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import java.util.Objects; + /** * @author zhangchenbiao * @FileName: LoginController @@ -40,8 +42,10 @@ public class LoginController { String userId = "", corpId = "", appType = AppTypeEnum.FEI_SHU.getValue(); try { String value = "code=" + code + "&appType=" + appType + "&appId=" + appId; - //todo zcb JSONObject 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"); diff --git a/coolstore-partner-webb/src/main/resources/application-ab.properties b/coolstore-partner-webb/src/main/resources/application-ab.properties index ce4b48860..f486788e3 100644 --- a/coolstore-partner-webb/src/main/resources/application-ab.properties +++ b/coolstore-partner-webb/src/main/resources/application-ab.properties @@ -33,8 +33,5 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -com.alipay.sofa.rpc.registry.address=zookeeper://tzk.coolcollege.cn:2188 -com.alipay.sofa.rpc.bolt.port=31010 - isv.domain = https://tstore-isv.coolcollege.cn get.user.id.by.code = /isv/v2/get_user_id_by_code diff --git a/coolstore-partner-webb/src/main/resources/application-dev.properties b/coolstore-partner-webb/src/main/resources/application-dev.properties index 802b1b915..5652d7677 100644 --- a/coolstore-partner-webb/src/main/resources/application-dev.properties +++ b/coolstore-partner-webb/src/main/resources/application-dev.properties @@ -37,8 +37,5 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -com.alipay.sofa.rpc.registry.address=zookeeper://dzk.coolcollege.cn:2188 -com.alipay.sofa.rpc.bolt.port=31010 - isv.domain = https://dstore-isv.coolcollege.cn get.user.id.by.code = /isv/v2/get_user_id_by_code \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-hd.properties b/coolstore-partner-webb/src/main/resources/application-hd.properties index ca674e7d8..da65850ce 100644 --- a/coolstore-partner-webb/src/main/resources/application-hd.properties +++ b/coolstore-partner-webb/src/main/resources/application-hd.properties @@ -33,8 +33,5 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -com.alipay.sofa.rpc.registry.address=zookeeper://10.7.53.199:2188 -com.alipay.sofa.rpc.bolt.port=31010 - isv.domain = https://hdstore-isv.coolcollege.cn get.user.id.by.code = /isv/v2/get_user_id_by_code \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-local.properties b/coolstore-partner-webb/src/main/resources/application-local.properties index 64740c502..c389a67ea 100644 --- a/coolstore-partner-webb/src/main/resources/application-local.properties +++ b/coolstore-partner-webb/src/main/resources/application-local.properties @@ -40,8 +40,5 @@ customize_sub_table_size=10 mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -com.alipay.sofa.rpc.registry.address=zookeeper://localhost:2181 -com.alipay.sofa.rpc.bolt.port=31010 - isv.domain = https://tstore-isv.coolcollege.cn get.user.id.by.code = /isv/v2/get_user_id_by_code \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-online.properties b/coolstore-partner-webb/src/main/resources/application-online.properties index b00f3bc88..389f5d03e 100644 --- a/coolstore-partner-webb/src/main/resources/application-online.properties +++ b/coolstore-partner-webb/src/main/resources/application-online.properties @@ -33,8 +33,5 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -com.alipay.sofa.rpc.registry.address=zookeeper://10.6.49.221:2188,10.6.49.222:2188,10.6.49.223:2188 -com.alipay.sofa.rpc.bolt.port=31010 - isv.domain = https://store-isv.coolcollege.cn get.user.id.by.code = /isv/v2/get_user_id_by_code \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-pre.properties b/coolstore-partner-webb/src/main/resources/application-pre.properties index bf0c5edad..389f5d03e 100644 --- a/coolstore-partner-webb/src/main/resources/application-pre.properties +++ b/coolstore-partner-webb/src/main/resources/application-pre.properties @@ -33,8 +33,5 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -com.alipay.sofa.rpc.registry.address=zookeeper://10.7.54.149:2188 -com.alipay.sofa.rpc.bolt.port=31010 - isv.domain = https://store-isv.coolcollege.cn get.user.id.by.code = /isv/v2/get_user_id_by_code \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-test.properties b/coolstore-partner-webb/src/main/resources/application-test.properties index 2b4be7a26..adc2ccb37 100644 --- a/coolstore-partner-webb/src/main/resources/application-test.properties +++ b/coolstore-partner-webb/src/main/resources/application-test.properties @@ -33,8 +33,5 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -com.alipay.sofa.rpc.registry.address=zookeeper://tzk.coolcollege.cn:2188 -com.alipay.sofa.rpc.bolt.port=31010 - isv.domain = https://tstore-isv.coolcollege.cn get.user.id.by.code = /isv/v2/get_user_id_by_code \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-ab.properties b/coolstore-partner-webc/src/main/resources/application-ab.properties index a2876bfc7..546d21a83 100644 --- a/coolstore-partner-webc/src/main/resources/application-ab.properties +++ b/coolstore-partner-webc/src/main/resources/application-ab.properties @@ -32,6 +32,3 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true - -com.alipay.sofa.rpc.registry.address=zookeeper://tzk.coolcollege.cn:2188 -com.alipay.sofa.rpc.bolt.port=30910 diff --git a/coolstore-partner-webc/src/main/resources/application-dev.properties b/coolstore-partner-webc/src/main/resources/application-dev.properties index c3074e3eb..ebdc6418f 100644 --- a/coolstore-partner-webc/src/main/resources/application-dev.properties +++ b/coolstore-partner-webc/src/main/resources/application-dev.properties @@ -35,7 +35,4 @@ spring.mvc.async.request-timeout=60000 mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true -mybatis.configuration.map-underscore-to-camel-case=true - -com.alipay.sofa.rpc.registry.address=zookeeper://dzk.coolcollege.cn:2188 -com.alipay.sofa.rpc.bolt.port=30910 \ No newline at end of file +mybatis.configuration.map-underscore-to-camel-case=true \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-hd.properties b/coolstore-partner-webc/src/main/resources/application-hd.properties index 7db4976d1..58a7dbde2 100644 --- a/coolstore-partner-webc/src/main/resources/application-hd.properties +++ b/coolstore-partner-webc/src/main/resources/application-hd.properties @@ -31,7 +31,4 @@ spring.mvc.async.request-timeout=60000 mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true -mybatis.configuration.map-underscore-to-camel-case=true - -com.alipay.sofa.rpc.registry.address=zookeeper://10.7.53.199:2188 -com.alipay.sofa.rpc.bolt.port=30910 \ No newline at end of file +mybatis.configuration.map-underscore-to-camel-case=true \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-local.properties b/coolstore-partner-webc/src/main/resources/application-local.properties index a6c973431..76c957a9d 100644 --- a/coolstore-partner-webc/src/main/resources/application-local.properties +++ b/coolstore-partner-webc/src/main/resources/application-local.properties @@ -39,6 +39,3 @@ customize_sub_table_size=10 mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true - -com.alipay.sofa.rpc.registry.address=zookeeper://localhost:2181 -com.alipay.sofa.rpc.bolt.port=30910 \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-online.properties b/coolstore-partner-webc/src/main/resources/application-online.properties index dfa30f41a..58a7dbde2 100644 --- a/coolstore-partner-webc/src/main/resources/application-online.properties +++ b/coolstore-partner-webc/src/main/resources/application-online.properties @@ -31,7 +31,4 @@ spring.mvc.async.request-timeout=60000 mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true -mybatis.configuration.map-underscore-to-camel-case=true - -com.alipay.sofa.rpc.registry.address=zookeeper://10.6.49.221:2188,10.6.49.222:2188,10.6.49.223:2188 -com.alipay.sofa.rpc.bolt.port=30910 \ No newline at end of file +mybatis.configuration.map-underscore-to-camel-case=true \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-pre.properties b/coolstore-partner-webc/src/main/resources/application-pre.properties index e16191656..58a7dbde2 100644 --- a/coolstore-partner-webc/src/main/resources/application-pre.properties +++ b/coolstore-partner-webc/src/main/resources/application-pre.properties @@ -31,7 +31,4 @@ spring.mvc.async.request-timeout=60000 mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true -mybatis.configuration.map-underscore-to-camel-case=true - -com.alipay.sofa.rpc.registry.address=zookeeper://10.7.54.149:2188 -com.alipay.sofa.rpc.bolt.port=30910 \ No newline at end of file +mybatis.configuration.map-underscore-to-camel-case=true \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-test.properties b/coolstore-partner-webc/src/main/resources/application-test.properties index 095a3a09a..87a6395cd 100644 --- a/coolstore-partner-webc/src/main/resources/application-test.properties +++ b/coolstore-partner-webc/src/main/resources/application-test.properties @@ -31,7 +31,4 @@ spring.mvc.async.request-timeout=60000 mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true -mybatis.configuration.map-underscore-to-camel-case=true - -com.alipay.sofa.rpc.registry.address=zookeeper://tzk.coolcollege.cn:2188 -com.alipay.sofa.rpc.bolt.port=30910 \ No newline at end of file +mybatis.configuration.map-underscore-to-camel-case=true \ No newline at end of file diff --git a/pom.xml b/pom.xml index df67557a9..ce88a6960 100644 --- a/pom.xml +++ b/pom.xml @@ -126,6 +126,11 @@ shiro-core 1.2.3 + + com.aliyun.openservices + ons-client + 1.8.8.3.Final +