From 3c4d486d9d41d9aee4da312b68db19ac9332420e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 08 二月 2025 18:15:20 +0800
Subject: [PATCH] aaa
---
server/company/src/main/java/com/doumee/api/business/GoodsController.java | 2
server/service/src/main/java/com/doumee/service/CateParamSelectService.java | 1
server/service/src/main/java/com/doumee/dao/business/GoodsParamMapper.java | 3
server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java | 2
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 2
server/service/src/main/java/com/doumee/dao/business/CateParamMapper.java | 3
server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 1
server/service/src/main/resources/mappers/CateParamSelectMapper.xml | 4
server/service/src/main/java/com/doumee/dao/business/model/GoodsParam.java | 4
server/company/src/main/resources/application.yml | 7
server/company/src/main/java/com/doumee/api/business/CateParamSelectController.java | 2
server/service/src/main/java/com/doumee/service/impl/CateParamSelectServiceImpl.java | 71 +++++++++++++
/dev/null | 40 --------
server/zhubo/src/main/resources/application.yml | 5
server/company/src/main/resources/logback-spring.xml | 61 ++++++++++++
server/pom.xml | 4
server/.idea/encodings.xml | 8 +
.idea/compiler.xml | 1
server/.idea/compiler.xml | 9 +
server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java | 2
server/service/src/main/resources/application-proV2.yml | 51 ++++++++++
21 files changed, 223 insertions(+), 60 deletions(-)
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index bca72a5..c84e039 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,6 +2,7 @@
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
+ <profile default="true" name="Default" enabled="true" />
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
diff --git a/server/.idea/compiler.xml b/server/.idea/compiler.xml
index 26d8bd7..e8cdb4a 100644
--- a/server/.idea/compiler.xml
+++ b/server/.idea/compiler.xml
@@ -8,12 +8,21 @@
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="pre_select" />
+ <module name="company" />
+ <module name="zhubo" />
+ <module name="platform" />
+ <module name="service" />
</profile>
</annotationProcessing>
</component>
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
+ <module name="company" options="-parameters" />
+ <module name="platform" options="-parameters" />
<module name="pre_select" options="-parameters" />
+ <module name="preselect" options="-parameters" />
+ <module name="service" options="-parameters" />
+ <module name="zhubo" options="-parameters" />
</option>
</component>
</project>
\ No newline at end of file
diff --git a/server/.idea/encodings.xml b/server/.idea/encodings.xml
index aa00ffa..0e2eab3 100644
--- a/server/.idea/encodings.xml
+++ b/server/.idea/encodings.xml
@@ -1,7 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
+ <file url="file://$PROJECT_DIR$/company/src/main/java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/company/src/main/resources" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/platform/src/main/java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/platform/src/main/resources" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/service/src/main/java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/service/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/zhubo/src/main/java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/zhubo/src/main/resources" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
diff --git a/server/company/src/main/java/com/doumee/api/business/CateParamSelectController.java b/server/company/src/main/java/com/doumee/api/business/CateParamSelectController.java
index 12393b5..c4419f3 100644
--- a/server/company/src/main/java/com/doumee/api/business/CateParamSelectController.java
+++ b/server/company/src/main/java/com/doumee/api/business/CateParamSelectController.java
@@ -93,7 +93,7 @@
@ApiOperation("鏇存柊浼佷笟鍟嗗搧鍒嗙被閫夋嫨椤�")
@PostMapping("/renewCateParamSelect")
public ApiResponse renewCateParamSelect() {
- cateParamSelectService.dealCateParamSelect();
+ cateParamSelectService.dealCateParamSelectDo();
return ApiResponse.success("鍚屾鎿嶄綔鎴愬姛");
}
diff --git a/server/company/src/main/java/com/doumee/api/business/GoodsController.java b/server/company/src/main/java/com/doumee/api/business/GoodsController.java
index 27d39b8..783237c 100644
--- a/server/company/src/main/java/com/doumee/api/business/GoodsController.java
+++ b/server/company/src/main/java/com/doumee/api/business/GoodsController.java
@@ -147,7 +147,7 @@
return ApiResponse.success(val);
}
@ApiOperation("瀵煎叆鍥剧墖妯℃澘")
- @PostMapping("/importExcel")
+ @PostMapping("/importImgExcel")
@ApiImplicitParams({
@ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
})
diff --git a/server/company/src/main/resources/application.yml b/server/company/src/main/resources/application.yml
index ffeb82e..f729df1 100644
--- a/server/company/src/main/resources/application.yml
+++ b/server/company/src/main/resources/application.yml
@@ -5,13 +5,14 @@
env: development
# env: production
server:
- port: 10022
+# port: 10022
+ port: 10025
spring:
# application:git
# name: doumeemes
profiles:
- active: dev
+ active: pro
# JSON杩斿洖閰嶇疆
jackson:
@@ -54,7 +55,7 @@
# dao灞傜殑鏃ュ織璁剧疆涓篸ebug锛屾柟渚挎煡鐪媠ql
logging:
level:
- doumeemes.dao: debug
+ com.doumee.dao: debug
knife4j:
enable: true
diff --git a/server/company/src/main/resources/logback-spring.xml b/server/company/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..524670b
--- /dev/null
+++ b/server/company/src/main/resources/logback-spring.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+ <appender name="consoleLog" class="ch.qos.logback.core.ConsoleAppender">
+ <layout class="ch.qos.logback.classic.PatternLayout">
+ <pattern>%highlight(%date{yyyy-MM-dd HH:mm:ss}) | %highlight(%-5level) | %highlight(%thread) | %highlight(%logger) | %msg%n</pattern>
+ </layout>
+ </appender>
+ <property name="log.path" value="/mnt/sdc/jars/preselect_saas/jars/v2/log/company"></property>
+ <property name="log.fileSize" value="100MB"></property>
+ <property name="log.historyDays" value="7"></property>
+
+ <appender name="fileInfoLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <level>ERROR</level>
+ <!--鍖归厤灏辫垗鍘�-->
+ <onMatch>DENY</onMatch>
+ <onMismatch>ACCEPT</onMismatch>
+ </filter>
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+ </encoder>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <!--璺緞-->
+ <fileNamePattern>${log.path}/info.%d.%i.log</fileNamePattern>
+ <maxFileSize>${log.fileSize}</maxFileSize>
+ <maxHistory>${log.historyDays}</maxHistory>
+ <totalSizeCap>1GB</totalSizeCap>
+ </rollingPolicy>
+ </appender>
+
+ <appender name="fileErrorLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>ERROR</level>
+ </filter>
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+ </encoder>
+ <!--婊氬姩绛栫暐-->
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <!--璺緞-->
+ <fileNamePattern>${log.path}/error.%d.%i.log</fileNamePattern>
+ <maxFileSize>${log.fileSize}</maxFileSize>
+ <maxHistory>${log.historyDays}</maxHistory>
+ <totalSizeCap>1GB</totalSizeCap>
+ </rollingPolicy>
+ </appender>
+ <!-- 寮傛鍐欏叆鏃ュ織 -->
+ <appender name ="ASYNC" class= "ch.qos.logback.classic.AsyncAppender">
+ <!-- 涓嶄涪澶辨棩蹇�.榛樿鐨�,濡傛灉闃熷垪鐨�80%宸叉弧,鍒欎細涓㈠純TRACT銆丏EBUG銆両NFO绾у埆鐨勬棩蹇� -->
+ <discardingThreshold >0</discardingThreshold>
+ <!-- 鏇存敼榛樿鐨勯槦鍒楃殑娣卞害,璇ュ�间細褰卞搷鎬ц兘.榛樿鍊间负256 -->
+ <queueSize>512</queueSize>
+ <!-- 娣诲姞闄勫姞鐨刟ppender,鏈�澶氬彧鑳芥坊鍔犱竴涓� -->
+ <appender-ref ref ="fileInfoLog"/>
+ </appender>
+ <root level="info">
+ <appender-ref ref="consoleLog"/>
+ <appender-ref ref="fileInfoLog"/>
+ <appender-ref ref="fileErrorLog"/>
+ </root>
+</configuration>
\ No newline at end of file
diff --git a/server/pom.xml b/server/pom.xml
index ab0428b..726b574 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -30,7 +30,7 @@
<swagger.bootstrap-ui.version>1.9.6</swagger.bootstrap-ui.version>
<fastjson.version>1.2.70</fastjson.version>
<druid.version>1.2.0</druid.version>
- <mybatis.plus.version>3.4.2</mybatis.plus.version>
+ <mybatis.plus.version>3.5.7</mybatis.plus.version>
<apache.shiro.version>1.7.0</apache.shiro.version>
<oshi.version>5.7.0</oshi.version>
<jna.version>5.7.0</jna.version>
@@ -63,7 +63,7 @@
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
- <version>1.2.13</version>
+ <version>2.1.0</version>
</dependency>
<!-- 杩炴帴姹� -->
<dependency>
diff --git a/server/service/src/main/java/com/doumee/dao/business/CateParamMapper.java b/server/service/src/main/java/com/doumee/dao/business/CateParamMapper.java
index 4a9a4f6..80eedbe 100644
--- a/server/service/src/main/java/com/doumee/dao/business/CateParamMapper.java
+++ b/server/service/src/main/java/com/doumee/dao/business/CateParamMapper.java
@@ -2,11 +2,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.CateParam;
+import com.github.yulichang.base.MPJBaseMapper;
/**
* @author 姹熻箘韫�
* @date 2023/05/12 13:58
*/
-public interface CateParamMapper extends BaseMapper<CateParam> {
+public interface CateParamMapper extends MPJBaseMapper<CateParam> {
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/GoodsParamMapper.java b/server/service/src/main/java/com/doumee/dao/business/GoodsParamMapper.java
index 942750a..56d0178 100644
--- a/server/service/src/main/java/com/doumee/dao/business/GoodsParamMapper.java
+++ b/server/service/src/main/java/com/doumee/dao/business/GoodsParamMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.GoodsParam;
+import com.github.yulichang.base.MPJBaseMapper;
import java.util.List;
@@ -9,7 +10,7 @@
* @author 姹熻箘韫�
* @date 2023/05/12 13:58
*/
-public interface GoodsParamMapper extends BaseMapper<GoodsParam> {
+public interface GoodsParamMapper extends MPJBaseMapper<GoodsParam> {
void insertBatch(List<GoodsParam> goodsParamList);
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java b/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java
index ab188eb..97a4a17 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java
@@ -62,7 +62,7 @@
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
@ExcelColumn(name="鎺掑簭鐮�")
- private Integer sortnum;
+ private Long sortnum;
@ApiModelProperty(value = "鍥炬爣")
@ExcelColumn(name="鍥炬爣")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/GoodsParam.java b/server/service/src/main/java/com/doumee/dao/business/model/GoodsParam.java
index d0e65fd..f902bb9 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/GoodsParam.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/GoodsParam.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -74,5 +75,8 @@
@ApiModelProperty(value = "鍟嗗搧缂栫爜锛堝叧鑱攇oods琛級", example = "1")
@ExcelColumn(name="鍟嗗搧缂栫爜锛堝叧鑱攇oods琛級")
private Integer goodsId;
+ @ApiModelProperty(value = "鍒嗙被缂栫爜 ", example = "1")
+ @TableField(exist = false)
+ private Integer categoryId;
}
diff --git a/server/service/src/main/java/com/doumee/service/CateParamSelectService.java b/server/service/src/main/java/com/doumee/service/CateParamSelectService.java
index ce0f2ff..a20defb 100644
--- a/server/service/src/main/java/com/doumee/service/CateParamSelectService.java
+++ b/server/service/src/main/java/com/doumee/service/CateParamSelectService.java
@@ -98,4 +98,5 @@
long count(CateParamSelect cateParamSelect);
void dealCateParamSelect();
+ void dealCateParamSelectDo();
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
index 0c53211..e45e5e6 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
@@ -85,7 +85,7 @@
// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+baseGoods.getName()+"銆戝凡瀛樺湪");
// }
- Integer integer = baseGoodsMapper.selectCount(new QueryWrapper<BaseGoods>().eq("ISDELETED", Constants.ZERO));
+ Long integer = baseGoodsMapper.selectCount(new QueryWrapper<BaseGoods>().eq("ISDELETED", Constants.ZERO));
BaseGoods insert = new BaseGoods();
insert.setCreator(user.getId());
insert.setCreateDate(new Date());
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 96c00c3..0c55e2a 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -140,7 +140,7 @@
.eq(SystemUser::getType,Constants.ONE)
.eq(SystemUser::getDeleted,Boolean.FALSE)
.eq(SystemUser::getUsername,company.getManagerUserName());
- Integer integer = systemUserMapper.selectCount(query);
+ Long integer = systemUserMapper.selectCount(query);
if (integer > Constants.ZERO){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璐﹀彿宸插瓨鍦ㄨ閲嶆柊杈撳叆璐﹀彿");
}
diff --git a/server/service/src/main/java/com/doumee/service/impl/CateParamSelectServiceImpl.java b/server/service/src/main/java/com/doumee/service/impl/CateParamSelectServiceImpl.java
index 62bd13a..bc5ea07 100644
--- a/server/service/src/main/java/com/doumee/service/impl/CateParamSelectServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/impl/CateParamSelectServiceImpl.java
@@ -4,14 +4,23 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.CateParamMapper;
import com.doumee.dao.business.CateParamSelectMapper;
+import com.doumee.dao.business.GoodsParamMapper;
+import com.doumee.dao.business.model.CateParam;
import com.doumee.dao.business.model.CateParamSelect;
+import com.doumee.dao.business.model.Goods;
+import com.doumee.dao.business.model.GoodsParam;
import com.doumee.service.CateParamSelectService;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
@@ -20,6 +29,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -35,6 +46,8 @@
@Autowired
private CateParamSelectMapper cateParamSelectMapper;
+ @Autowired
+ private GoodsParamMapper goodsParamMapper;
@Override
public Integer create(CateParamSelect cateParamSelect) {
@@ -154,12 +167,16 @@
@Override
@Async
- @Transactional
public void dealCateParamSelect() {
+ dealCateParamSelectDo();
+ }
+ @Override
+ @Transactional
+ public void dealCateParamSelectDo() {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
Boolean isGrouping = (Boolean)redisTemplate.opsForValue().get(loginUserInfo.getCompanyId()+Constants.CATE_PARAM_OPEN);
if(isGrouping!=null && isGrouping ){
- return;
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟鍙傛暟閫夐」鍒濆鍖栨鍦ㄦ墽琛岋紝璇风◢鍚庨噸璇曪紒");
}
redisTemplate.opsForValue().set(loginUserInfo.getCompanyId()+Constants.CATE_PARAM_OPEN,true);
try {
@@ -167,6 +184,45 @@
cateParamSelectMapper.delete(new QueryWrapper<CateParamSelect>().exists(" select 1 from category c where c.id = cate_param_select.category_id and c.company_id = "+loginUserInfo.getCompanyId()+" "));
//鏂板褰撳墠浼佷笟鍙互浣跨敤鐨勬暟鎹�
cateParamSelectMapper.insertBatch(loginUserInfo.getCompanyId(),loginUserInfo.getId());
+ /*List<CateParamSelect> list = new ArrayList<>();
+ List<GoodsParam> params = goodsParamMapper.selectJoinList(GoodsParam.class,new MPJLambdaWrapper<GoodsParam>()
+ .select( GoodsParam::getPramaId)
+ .select( "TRIM(REPLACE(t.val,'聽','')) as val,CONCAT(TRIM(REPLACE(t.val,'聽','')),t.PRAMA_ID,t1.CATEGORY_ID ) as uky")
+ .selectAs(Goods::getCategoryId,CateParamSelect::getCategoryId)
+ .innerJoin(Goods.class,Goods::getId,GoodsParam::getGoodsId)
+ .isNotNull(GoodsParam::getPramaId)
+ .isNotNull(GoodsParam::getVal)
+ .ne(GoodsParam::getVal,"")
+ .eq(Goods::getIsdeleted,Constants.ZERO )
+ .eq(Goods::getStatus,Constants.ZERO )
+ .eq(Goods::getCompanyId,loginUserInfo.getCompanyId())
+ .groupBy("uky")
+ );
+ if(params.size()>0){
+ Date date = new Date();
+ for(GoodsParam p : params){
+ if(StringUtils.isBlank(p.getVal()) || StringUtils.equals(p.getVal().trim(),"")){
+ continue;
+ }
+ if(repeatValParam(p,list)){
+ continue;
+ }
+ p.setVal(p.getVal().trim());
+ CateParamSelect cp = new CateParamSelect();
+ cp.setCategoryId(p.getCategoryId());
+ cp.setName(p.getVal());
+ cp.setIsdeleted(Constants.ZERO);
+ cp.setCreateDate(date);
+ cp.setParamId(p.getPramaId());
+ cp.setStatus(Constants.ZERO);
+ cp.setCreator(loginUserInfo.getId());
+// cateParamSelectMapper.insert(cp);
+ list.add(cp);
+ }
+ }
+ if(list.size()>0){
+ cateParamSelectMapper.insert(list);
+ }*/
}catch (Exception e){
e.printStackTrace();
}finally {
@@ -174,5 +230,16 @@
}
}
+ private boolean repeatValParam(GoodsParam p, List<CateParamSelect> list) {
+ for(CateParamSelect cp :list){
+ if(StringUtils.equals(cp.getName(),p.getVal())
+ && Constants.equalsInteger(cp.getParamId(),p.getPramaId())
+ && Constants.equalsInteger(cp.getCategoryId(),p.getCategoryId())){
+ return true;
+ }
+ }
+ return false;
+ }
+
}
diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
index b41579c..2bc2874 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -1,6 +1,5 @@
package com.doumee.service.system.impl;
-import com.baomidou.mybatisplus.extension.api.R;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
diff --git a/server/service/src/main/resources/application-proV2.yml b/server/service/src/main/resources/application-proV2.yml
new file mode 100644
index 0000000..e00de33
--- /dev/null
+++ b/server/service/src/main/resources/application-proV2.yml
@@ -0,0 +1,51 @@
+# WEB鏈嶅姟鍣ㄩ厤缃�
+server:
+ compression:
+ enabled: true
+ mime-types: application/json
+
+ tomcat:
+ max-swallow-size: -1
+ servlet:
+ session:
+ timeout: PT3H #琛ㄧず12灏忔椂
+
+spring:
+ # 鏁版嵁婧愰厤缃�
+ datasource:
+ url: jdbc:mysql://57b57595ddc66.sh.cdb.myqcloud.com:4464/pre_select_saas?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
+ username: test
+ password: doumee@168
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ type: com.alibaba.druid.pool.DruidDataSource
+
+ redis:
+ # database: 0
+ host: 127.0.0.1
+ port: 6379
+ password:
+ timeout: 5000 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+
+ jackson:
+ time-zone: GMT+8
+ date-format: yyyy-MM-dd HH:mm:ss
+
+knife4j:
+ enable: true
+ basic:
+ enable: true
+ username: admin
+ password: 111111
+
+debug_model: false
+
+captcha_check: true
+
+# Swagger閰嶇疆
+swagger:
+ host:
+ title: ${project.name}鎺ュ彛鏂囨。
+ description: ${project.name}鎺ュ彛鏂囨。
+ enabled: true
+ # 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧�
+ redirect-uri: /
diff --git a/server/service/src/main/resources/logback-spring.xml b/server/service/src/main/resources/logback-spring.xml
deleted file mode 100644
index 3f47325..0000000
--- a/server/service/src/main/resources/logback-spring.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
- <springProperty scope="context" name="logbackLevel" source="logback.level"/>
- <springProperty scope="context" name="logbackAppender" source="logback.appender"/>
- <!-- 寮�鍙戠幆澧冿紙杈撳嚭鍒版帶鍒跺彴锛� -->
- <appender name="development" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <!-- 璁剧疆鏃ュ織杈撳嚭鏍煎紡 -->
- <pattern>%d %p (%file:%line\)- %m%n</pattern>
- <!-- 杈撳嚭缂栫爜 -->
- <charset>UTF-8</charset>
- </encoder>
- </appender>
-
- <!-- 娴嬭瘯/绾夸笂鐜锛堥�氳繃鏃ユ湡鍒嗗壊鏃ュ織鏂囦欢锛� -->
- <appender name="production"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <File>log/eva.log</File>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 鏂囦欢鍚嶉厤缃� -->
- <fileNamePattern>log/eva-%d.%i.log</fileNamePattern>
- <!-- 鏃ュ織鏂囦欢淇濆瓨鏈熼檺锛堝崟浣嶅ぉ锛� -->
- <maxHistory>30</maxHistory>
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <!-- 璁剧疆鏃ュ織鏂囦欢澶у皬锛岄粯璁ゅ�兼槸10MB-->
- <maxFileSize>100MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
- </rollingPolicy>
- <encoder>
- <!-- 璁剧疆鏃ュ織杈撳嚭鏍煎紡 -->
- <pattern>%d %p (%file:%line\)- %m%n</pattern>
- <!-- 杈撳嚭缂栫爜 -->
- <charset>UTF-8</charset>
- </encoder>
- </appender>
- <!-- 璁剧疆鏃ュ織绾у埆鍜岃緭鍑烘ā寮� -->
- <root level="${logbackLevel}">
- <appender-ref ref="${logbackAppender}" />
- </root>
-</configuration>
diff --git a/server/service/src/main/resources/mappers/CateParamSelectMapper.xml b/server/service/src/main/resources/mappers/CateParamSelectMapper.xml
index 04acf37..6a1f682 100644
--- a/server/service/src/main/resources/mappers/CateParamSelectMapper.xml
+++ b/server/service/src/main/resources/mappers/CateParamSelectMapper.xml
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.doumee.dao.business.CateParamSelectMapper">
-
-
<insert id="insertBatch" >
INSERT INTO `cate_param_select`
(`CREATOR`, `CREATE_DATE`, `EDITOR`, `EDIT_DATE`, `ISDELETED`, `REMARK`, `NAME`, `PARAM_ID`, `CATEGORY_ID`,
`STATUS`, `SORTNUM`)
- select DISTINCT #{userId} , now(),null , null , 0 , null , a.VAL , a.PRAMA_ID , b.CATEGORY_ID , 0 , null from goods_param a inner join goods b on a.GOODS_ID = b.ID
+ select DISTINCT #{userId} , now(),null , null , 0 , null , TRIM(REPLACE(a.val,'聽','')), a.PRAMA_ID , b.CATEGORY_ID , 0 , null from goods_param a inner join goods b on a.GOODS_ID = b.ID
and a.PRAMA_ID is not null AND a.VAL is not null
and a.ISDELETED = 0
and a.`STATUS` = 0
diff --git a/server/zhubo/src/main/resources/application.yml b/server/zhubo/src/main/resources/application.yml
index cfb19a6..3211694 100644
--- a/server/zhubo/src/main/resources/application.yml
+++ b/server/zhubo/src/main/resources/application.yml
@@ -5,13 +5,14 @@
env: development
# env: production
server:
- port: 10024
+# port: 10024
+ port: 10026
spring:
# application:
# name: doumeemes
profiles:
- active: dev
+ active: pro
# JSON杩斿洖閰嶇疆
jackson:
--
Gitblit v1.9.3