admin
2021-06-24 df4441322e9801c102299451da41d7c40b4502e9
zookeeper地址修改,Maven采用私服
25个文件已修改
138 ■■■■■ 已修改文件
facade-app/pom.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
facade-lucky/pom.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
generater/pom.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pom.xml 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-app/src/main/java/com/ks/app/aspect/AppParamsCheckAspect.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-app/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-app/src/test/java/com/ks/app/AppTest.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/aspect/LuckyParamsCheckAspect.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/UserController.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/service/ActivityScanRecordService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/service/ActivityTagService.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/service/AnnouncementService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/service/AppConfigService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/service/UserInfoService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/ActivityScanRecordServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/ActivityTagServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/AnnouncementServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/AppConfigServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/UserInfoServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/main/resources/application-pro.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/test/java/com/ks/daylucky/UserTest.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-daylucky/src/test/java/com/ks/daylucky/VisualUserTest.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-lucky/src/main/java/com/ks/lucky/aspect/LuckyParamsCheckAspect.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-lucky/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
facade-app/pom.xml
@@ -19,6 +19,12 @@
            <artifactId>lib-common</artifactId>
            <version>0.0.1-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.yeshi</groupId>
            <artifactId>utils</artifactId>
            <version>0.0.2-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>
facade-lucky/pom.xml
@@ -23,7 +23,7 @@
        <dependency>
            <groupId>com.yeshi</groupId>
            <artifactId>utils</artifactId>
            <version>0.0.2-SNAPSHOT</version>
            <version>0.0.5</version>
            <exclusions>
                <exclusion>
                    <groupId>org.slf4j</groupId>
generater/pom.xml
@@ -31,7 +31,7 @@
        <dependency>
            <groupId>com.yeshi</groupId>
            <artifactId>utils</artifactId>
            <version>0.0.2-SNAPSHOT</version>
            <version>0.0.5</version>
        </dependency>
    </dependencies>
pom.xml
@@ -168,9 +168,51 @@
            <artifactId>spring-boot-starter-data-redis</artifactId>
        </dependency>
        <dependency>
            <groupId>redis.clients</groupId>
            <artifactId>jedis</artifactId>
            <version>3.1.0</version>
            <type>jar</type>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.qcloud</groupId>
            <artifactId>cmq-http-client</artifactId>
            <version>1.0.7</version>
        </dependency>
        <!-- 支付宝相关 -->
        <dependency>
            <groupId>com.alipay.sdk</groupId>
            <artifactId>alipay-sdk-java</artifactId>
            <version>4.9.71.ALL</version>
        </dependency>
        <dependency>
            <groupId>net.sf.json-lib</groupId>
            <artifactId>json-lib</artifactId>
            <version>2.4</version>
            <classifier>jdk15</classifier>
        </dependency>
        <dependency>
            <groupId>org.jsoup</groupId>
            <artifactId>jsoup</artifactId>
            <version>1.9.2</version>
        </dependency>
    </dependencies>
    <repositories>
        <repository>
            <id>nexus</id>
            <name>nexus</name>
            <url>http://193.112.35.168:8081/nexus/content/groups/public/</url>
        </repository>
    </repositories>
    <build>
        <finalName>DayLucky</finalName>
        <plugins>
service-app/src/main/java/com/ks/app/aspect/AppParamsCheckAspect.java
@@ -1,6 +1,5 @@
package com.ks.app.aspect;
import com.beust.jcommander.internal.Lists;
import com.google.gson.Gson;
import com.ks.lib.common.exception.ParamsException;
import org.aspectj.lang.JoinPoint;
@@ -13,6 +12,7 @@
import javax.validation.ConstraintViolation;
import javax.validation.Validation;
import javax.validation.Validator;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -39,7 +39,7 @@
        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
        // 执行方法参数的校验
        Set<ConstraintViolation<Object>> constraintViolations = validator.forExecutables().validateParameters(joinPoint.getThis(), signature.getMethod(), args);
        List<String> messages = Lists.newArrayList();
        List<String> messages = new ArrayList<>();
        for (ConstraintViolation<Object> error : constraintViolations) {
            messages.add(error.getMessage());
        }
service-app/src/main/resources/application.yml
@@ -65,7 +65,7 @@
    name: app-provider
  registry:
    protocol: zookeeper
    address: zookeeper://134.175.68.214:2181 # 134.175.68.214   134.175.68.214:2181
    address: zookeeper://172.16.16.46:2181 # 134.175.68.214   134.175.68.214:2181
    client: curator
  protocol:
    name: dubbo
service-app/src/test/java/com/ks/app/AppTest.java
@@ -1,11 +1,11 @@
package com.ks.app;
import com.alipay.api.internal.util.file.IOUtils;
import com.ks.app.entity.AppAlipayInfoWithBLOBs;
import com.ks.app.entity.AppInfo;
import com.ks.app.exception.AppException;
import com.ks.app.service.AppAlipayInfoManager;
import com.ks.app.service.AppInfoManager;
import org.apache.commons.io.IOUtils;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.yeshi.utils.StringUtil;
service-daylucky/src/main/java/com/ks/daylucky/aspect/LuckyParamsCheckAspect.java
@@ -1,6 +1,5 @@
package com.ks.daylucky.aspect;
import com.beust.jcommander.internal.Lists;
import com.google.gson.Gson;
import com.ks.lib.common.exception.ParamsException;
import org.aspectj.lang.JoinPoint;
@@ -13,6 +12,7 @@
import javax.validation.ConstraintViolation;
import javax.validation.Validation;
import javax.validation.Validator;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -39,7 +39,7 @@
        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
        // 执行方法参数的校验
        Set<ConstraintViolation<Object>> constraintViolations = validator.forExecutables().validateParameters(joinPoint.getThis(), signature.getMethod(), args);
        List<String> messages = Lists.newArrayList();
        List<String> messages = new ArrayList<>();
        for (ConstraintViolation<Object> error : constraintViolations) {
            messages.add(error.getMessage());
        }
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java
@@ -15,6 +15,7 @@
import com.ks.daylucky.util.activity.ActivityUtil;
import com.ks.daylucky.util.factory.vo.ActivityDetailVOFactory;
import com.ks.daylucky.util.factory.vo.ActivityListItemInfoVOFactory;
import com.ks.lib.common.exception.ParamsException;
import com.ks.lucky.pojo.DO.LuckyActivity;
import com.ks.lucky.remote.service.LuckyActivityJoinAssistService;
import com.ks.lucky.remote.service.LuckyActivityService;
@@ -69,7 +70,7 @@
     */
    @ResponseBody
    @RequestMapping("getActivityDetail")
    public String getActivityDetail(AcceptData acceptData, Long activityId) {
    public String getActivityDetail(AcceptData acceptData, Long activityId) throws ParamsException {
        ActivityDetailInfoDTO dto = activityService.getActivityDetail(activityId, acceptData.getApp().getId(), acceptData.getUid(), true, 8, false);
        if (dto == null) {
            return JsonUtil.loadFalseResult("活动不存在");
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/UserController.java
@@ -27,6 +27,7 @@
import com.ks.daylucky.util.UserInfoUtil;
import com.ks.daylucky.util.annotation.RequestSerializable;
import com.ks.daylucky.util.factory.vo.UserMsgVOFactory;
import com.ks.lib.common.exception.ParamsException;
import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -96,6 +97,8 @@
                    user.setId(uid);
                } catch (UserInfoException e) {
                    return JsonUtil.loadFalseResult("token获取失败");
                } catch (ParamsException e) {
                    return JsonUtil.loadFalseResult("token获取失败");
                }
            }
service-daylucky/src/main/java/com/ks/daylucky/service/ActivityScanRecordService.java
@@ -1,7 +1,7 @@
package com.ks.daylucky.service;
import com.beust.jcommander.ParameterException;
import com.ks.daylucky.pojo.DO.ActivityScanRecord;
import com.ks.lib.common.exception.ParamsException;
import javax.validation.Valid;
import java.util.List;
@@ -15,9 +15,9 @@
     * 添加记录
     *
     * @param record
     * @throws ParameterException
     * @throws ParamsException
     */
    public void addRecord(@Valid ActivityScanRecord record) throws ParameterException;
    public void addRecord(@Valid ActivityScanRecord record) throws ParamsException;
    /**
service-daylucky/src/main/java/com/ks/daylucky/service/ActivityTagService.java
@@ -1,7 +1,7 @@
package com.ks.daylucky.service;
import com.beust.jcommander.ParameterException;
import com.ks.daylucky.pojo.DO.ActivityTag;
import com.ks.lib.common.exception.ParamsException;
import javax.validation.Valid;
import java.util.List;
@@ -15,9 +15,9 @@
     * 添加活动标签
     *
     * @param tag
     * @throws ParameterException
     * @throws ParamsException
     */
    public void addActivityTag(@Valid ActivityTag tag) throws ParameterException;
    public void addActivityTag(@Valid ActivityTag tag) throws ParamsException;
    /**
@@ -26,7 +26,7 @@
     * @param activityId
     * @param tags
     */
    public void setTags(Long activityId, List<ActivityTag> tags);
    public void setTags(Long activityId, List<ActivityTag> tags) throws ParamsException;
    /**
service-daylucky/src/main/java/com/ks/daylucky/service/AnnouncementService.java
@@ -1,9 +1,9 @@
package com.ks.daylucky.service;
import com.beust.jcommander.ParameterException;
import com.ks.daylucky.exception.AnnouncementException;
import com.ks.daylucky.pojo.DO.Announcement;
import com.ks.daylucky.query.AnnouncementQuery;
import com.ks.lib.common.exception.ParamsException;
import javax.validation.Valid;
import java.util.List;
@@ -18,10 +18,10 @@
     * 添加公告
     *
     * @param announcement
     * @throws ParameterException
     * @throws ParamsException
     * @throws AnnouncementException
     */
    public void addAnnouncement(@Valid Announcement announcement) throws ParameterException, AnnouncementException;
    public void addAnnouncement(@Valid Announcement announcement) throws ParamsException, AnnouncementException;
    /**
service-daylucky/src/main/java/com/ks/daylucky/service/AppConfigService.java
@@ -1,10 +1,10 @@
package com.ks.daylucky.service;
import com.beust.jcommander.ParameterException;
import com.ks.daylucky.exception.AppConfigException;
import com.ks.daylucky.pojo.DO.AppConfig;
import com.ks.daylucky.pojo.DTO.ConfigKeyEnum;
import com.ks.daylucky.query.AppConfigQuery;
import com.ks.lib.common.exception.ParamsException;
import javax.validation.Valid;
import java.util.List;
@@ -19,10 +19,10 @@
     * 添加应用配置信息
     *
     * @param config
     * @throws ParameterException
     * @throws ParamsException
     * @throws AppConfigException
     */
    public void addAppConfig(@Valid AppConfig config) throws ParameterException, AppConfigException;
    public void addAppConfig(@Valid AppConfig config) throws ParamsException, AppConfigException;
    /**
service-daylucky/src/main/java/com/ks/daylucky/service/UserInfoService.java
@@ -1,10 +1,10 @@
package com.ks.daylucky.service;
import com.beust.jcommander.ParameterException;
import com.ks.daylucky.exception.UserInfoException;
import com.ks.daylucky.pojo.DO.UserInfo;
import com.ks.daylucky.pojo.VO.SimpleUser;
import com.ks.daylucky.query.UserInfoQuery;
import com.ks.lib.common.exception.ParamsException;
import com.ks.lucky.pojo.DO.BaseUser;
import javax.validation.Valid;
@@ -27,10 +27,10 @@
     * 添加用户
     *
     * @param userInfo
     * @throws ParameterException
     * @throws ParamsException
     * @throws UserInfoException
     */
    public Long addUserInfo(@Valid UserInfo userInfo) throws ParameterException, UserInfoException;
    public Long addUserInfo(@Valid UserInfo userInfo) throws ParamsException, UserInfoException;
    public Map<Long, UserInfo> listUserInfoAsMap(BaseUser... users);
service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/ActivityScanRecordServiceImpl.java
@@ -1,10 +1,10 @@
package com.ks.daylucky.service.impl.remote;
import com.beust.jcommander.ParameterException;
import com.ks.daylucky.mapper.ActivityScanRecordMapper;
import com.ks.daylucky.pojo.DO.ActivityScanRecord;
import com.ks.daylucky.query.ActivityScanQuery;
import com.ks.daylucky.service.ActivityScanRecordService;
import com.ks.lib.common.exception.ParamsException;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import org.yeshi.utils.TimeUtil;
@@ -23,7 +23,7 @@
    @Validated
    @Override
    public void addRecord(@Valid ActivityScanRecord record) throws ParameterException {
    public void addRecord(@Valid ActivityScanRecord record) throws ParamsException {
        ActivityScanQuery query = new ActivityScanQuery();
        query.uid = record.getUid();
        query.activityId = record.getActivityId();
service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/ActivityTagServiceImpl.java
@@ -1,9 +1,9 @@
package com.ks.daylucky.service.impl.remote;
import com.beust.jcommander.ParameterException;
import com.ks.daylucky.mapper.ActivityTagMapper;
import com.ks.daylucky.pojo.DO.ActivityTag;
import com.ks.daylucky.service.ActivityTagService;
import com.ks.lib.common.exception.ParamsException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -24,7 +24,7 @@
    @Validated
    @Override
    public void addActivityTag(@Valid ActivityTag tag) throws ParameterException {
    public void addActivityTag(@Valid ActivityTag tag) throws ParamsException {
        if (tag.getWeight() == null) {
            tag.setWeight(1);
        }
@@ -34,7 +34,7 @@
    @Transactional(rollbackFor = Exception.class)
    @Override
    public void setTags(Long activityId, List<ActivityTag> tags) {
    public void setTags(Long activityId, List<ActivityTag> tags) throws ParamsException {
        if (tags == null) {
            return;
        }
service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/AnnouncementServiceImpl.java
@@ -1,11 +1,11 @@
package com.ks.daylucky.service.impl.remote;
import com.beust.jcommander.ParameterException;
import com.ks.daylucky.exception.AnnouncementException;
import com.ks.daylucky.mapper.AnnouncementMapper;
import com.ks.daylucky.pojo.DO.Announcement;
import com.ks.daylucky.query.AnnouncementQuery;
import com.ks.daylucky.service.AnnouncementService;
import com.ks.lib.common.exception.ParamsException;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -23,7 +23,7 @@
    @Validated
    @Override
    public void addAnnouncement(@Valid Announcement announcement) throws ParameterException, AnnouncementException {
    public void addAnnouncement(@Valid Announcement announcement) throws ParamsException, AnnouncementException {
        AnnouncementQuery query = new AnnouncementQuery();
        query.appId = announcement.getAppId();
        query.type = announcement.getType();
service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/AppConfigServiceImpl.java
@@ -1,12 +1,12 @@
package com.ks.daylucky.service.impl.remote;
import com.beust.jcommander.ParameterException;
import com.ks.daylucky.exception.AppConfigException;
import com.ks.daylucky.mapper.AppConfigMapper;
import com.ks.daylucky.pojo.DO.AppConfig;
import com.ks.daylucky.pojo.DTO.ConfigKeyEnum;
import com.ks.daylucky.query.AppConfigQuery;
import com.ks.daylucky.service.AppConfigService;
import com.ks.lib.common.exception.ParamsException;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -23,7 +23,7 @@
    @Validated
    @Override
    public void addAppConfig(@Valid AppConfig config) throws ParameterException, AppConfigException {
    public void addAppConfig(@Valid AppConfig config) throws ParamsException, AppConfigException {
        AppConfigQuery query = new AppConfigQuery();
        query.appId = config.getAppId();
        query.key = config.getKey();
service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/UserInfoServiceImpl.java
@@ -1,6 +1,5 @@
package com.ks.daylucky.service.impl.remote;
import com.beust.jcommander.ParameterException;
import com.ks.daylucky.exception.UserInfoException;
import com.ks.daylucky.mapper.UserInfoExtraMapper;
import com.ks.daylucky.mapper.UserInfoMapper;
@@ -10,6 +9,7 @@
import com.ks.daylucky.query.UserInfoQuery;
import com.ks.daylucky.service.UserInfoExtraService;
import com.ks.daylucky.service.UserInfoService;
import com.ks.lib.common.exception.ParamsException;
import com.ks.lucky.pojo.DO.BaseUser;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -45,7 +45,7 @@
    @Validated
    @Override
    public Long addUserInfo(@Valid UserInfo userInfo) throws ParameterException, UserInfoException {
    public Long addUserInfo(@Valid UserInfo userInfo) throws ParamsException, UserInfoException {
        UserInfo old = getUserInfo(userInfo.getAppId(), userInfo.getIdentifyCode());
        if (old != null) {
            throw new UserInfoException(UserInfoException.CODE_EXIST, "用户已存在");
service-daylucky/src/main/resources/application-pro.yml
@@ -72,7 +72,7 @@
    logger: slf4j
  registry:
    protocol: zookeeper
    address: zookeeper://134.175.68.214:2181 # 134.175.68.214   134.175.68.214:2181
    address: zookeeper://172.16.16.46:2181 # 134.175.68.214   134.175.68.214:2181
    client: curator
  consumer:
    check: false
service-daylucky/src/test/java/com/ks/daylucky/UserTest.java
@@ -34,7 +34,7 @@
            userInfo.setState(UserInfo.STATE_LOGINED);
            try {
                userInfoService.addUserInfo(userInfo);
            } catch (UserInfoException e) {
            } catch (Exception e) {
                e.printStackTrace();
            }
service-daylucky/src/test/java/com/ks/daylucky/VisualUserTest.java
@@ -1,9 +1,9 @@
package com.ks.daylucky;
import com.alipay.api.internal.util.file.IOUtils;
import com.ks.daylucky.exception.UserInfoException;
import com.ks.daylucky.pojo.DO.UserInfo;
import com.ks.daylucky.service.UserInfoService;
import org.apache.commons.io.IOUtils;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
@@ -316,7 +316,7 @@
                    userInfo.setState(UserInfo.STATE_LOGINED);
                    try {
                        userInfoService.addUserInfo(userInfo);
                    } catch (UserInfoException e) {
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                    p++;
service-lucky/src/main/java/com/ks/lucky/aspect/LuckyParamsCheckAspect.java
@@ -1,6 +1,5 @@
package com.ks.lucky.aspect;
import com.beust.jcommander.internal.Lists;
import com.google.gson.Gson;
import com.ks.lib.common.exception.ParamsException;
import org.aspectj.lang.JoinPoint;
@@ -15,6 +14,7 @@
import javax.validation.ConstraintViolation;
import javax.validation.Validation;
import javax.validation.Validator;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -43,7 +43,7 @@
        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
        // 执行方法参数的校验
        Set<ConstraintViolation<Object>> constraintViolations = validator.forExecutables().validateParameters(joinPoint.getThis(), signature.getMethod(), args);
        List<String> messages = Lists.newArrayList();
        List<String> messages = new ArrayList<>();
        for (ConstraintViolation<Object> error : constraintViolations) {
            messages.add(error.getMessage());
        }
service-lucky/src/main/resources/application.yml
@@ -71,7 +71,7 @@
    name: lucky-provider
  registry:
    protocol: zookeeper
    address: zookeeper://134.175.68.214:2181 # 134.175.68.214   134.175.68.214:2181
    address: zookeeper://172.16.16.46:2181 # 134.175.68.214   134.175.68.214:2181
    client: curator
  protocol:
    name: dubbo