jiazhizhong/crmeb_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

后端代码提交

Browse Source
This commit is contained in:
zzp
2025-06-24 16:23:52 +08:00
parent 35fec82e4a
commit 9c139cb43f
1284 changed files with 8023 additions and 17640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
crmeb/.mvn/wrapper/MavenWrapperDownloader.java vendored
View File

@@ -1,118 +0,0 @@
/*
* Copyright 2007-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import java.net.*;
import java.io.*;
import java.nio.channels.*;
import java.util.Properties;
public class MavenWrapperDownloader {
private static final String WRAPPER_VERSION = "0.5.6";
/**
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
*/
private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
/**
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
* use instead of the default one.
*/
private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
".mvn/wrapper/maven-wrapper.properties";
/**
* Path where the maven-wrapper.jar will be saved to.
*/
private static final String MAVEN_WRAPPER_JAR_PATH =
".mvn/wrapper/maven-wrapper.jar";
/**
* Name of the property which should be used to override the default download url for the wrapper.
*/
private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
public static void main(String args[]) {
System.out.println("- Downloader started");
File baseDirectory = new File(args[0]);
System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
// If the maven-wrapper.properties exists, read it and check if it contains a custom
// wrapperUrl parameter.
File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
String url = DEFAULT_DOWNLOAD_URL;
if (mavenWrapperPropertyFile.exists()) {
FileInputStream mavenWrapperPropertyFileInputStream = null;
try {
mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
Properties mavenWrapperProperties = new Properties();
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
} catch (IOException e) {
System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
} finally {
try {
if (mavenWrapperPropertyFileInputStream != null) {
mavenWrapperPropertyFileInputStream.close();
}
} catch (IOException e) {
// Ignore ...
}
}
}
System.out.println("- Downloading from: " + url);
File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
if (!outputFile.getParentFile().exists()) {
if (!outputFile.getParentFile().mkdirs()) {
System.out.println(
"- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
}
}
System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
try {
downloadFileFromURL(url, outputFile);
System.out.println("Done");
System.exit(0);
} catch (Throwable e) {
System.out.println("- Error downloading");
e.printStackTrace();
System.exit(1);
}
}
private static void downloadFileFromURL(String urlString, File destination) throws Exception {
if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
String username = System.getenv("MVNW_USERNAME");
char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
Authenticator.setDefault(new Authenticator() {
@Override
protected PasswordAuthentication getPasswordAuthentication() {
return new PasswordAuthentication(username, password);
}
});
}
URL website = new URL(urlString);
ReadableByteChannel rbc;
rbc = Channels.newChannel(website.openStream());
FileOutputStream fos = new FileOutputStream(destination);
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
fos.close();
rbc.close();
}
}

BIN
crmeb/.mvn/wrapper/maven-wrapper.jar vendored
View File

Binary file not shown.

2
crmeb/.mvn/wrapper/maven-wrapper.properties vendored
View File

@@ -1,2 +0,0 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

49
crmeb/crmeb-admin/pom.xml
View File

@@ -22,6 +22,29 @@
<artifactId>crmeb-service</artifactId>
<version>${crmeb-service}</version>
</dependency>
<!--quartz定时调度依赖-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-quartz</artifactId>
</dependency>
<!-- 此版本明确支持jdk8 oshi -->
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>5.8.6</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>5.13.0</version> <!-- 与 OSHI 5.8.6 兼容 -->
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>5.13.0</version> <!-- 必须与 jna 版本一致 -->
</dependency>
</dependencies>
<build>
@@ -40,6 +63,21 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<!-- 使用默认的变量标记方法即${*} -->
<useDefaultDelimiters>true</useDefaultDelimiters>
<nonFilteredFileExtensions>
<nonFilteredFileExtension>woff</nonFilteredFileExtension>
<nonFilteredFileExtension>woff2</nonFilteredFileExtension>
<nonFilteredFileExtension>eot</nonFilteredFileExtension>
<nonFilteredFileExtension>ttf</nonFilteredFileExtension>
<nonFilteredFileExtension>svg</nonFilteredFileExtension>
</nonFilteredFileExtensions>
</configuration>
</plugin>
</plugins>
<resources>
@@ -71,6 +109,17 @@
<include>**/*.xml</include>
</includes>
</resource>
<resource>
<filtering>true</filtering>
<directory>src/main/resources</directory>
<excludes>
<exclude>**/*.woff</exclude>
<exclude>**/*.ttf</exclude>
<exclude>**/*.eot</exclude>
<exclude>**/*.svg</exclude>
</excludes>
</resource>
</resources>
</build>

8
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/CrmebAdminApplication.java
View File

@@ -15,7 +15,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -27,6 +27,12 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@Configuration
@EnableTransactionManagement
@SpringBootApplication(exclude = DataSourceAutoConfiguration.class) //去掉数据源
//@ComponentScan(basePackages={"com.utils",
// "com.zbkj.crmeb",
// "com.exception",
// "com.common",
// "com.aop"}) //扫描utils包和父包
//@MapperScan(basePackages = {"com.zbkj.crmeb.*.dao", "com.zbkj.crmeb.*.*.dao"})
@ComponentScan(basePackages = {"com.zbkj"})
@MapperScan(basePackages = {"com.zbkj.**.dao"})
public class CrmebAdminApplication {

53
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/acpect/ControllerAspect.java
View File

@@ -1,53 +0,0 @@
package com.zbkj.admin.acpect;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import java.util.Arrays;
/**
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
* | Author: CRMEB Team <admin@crmeb.com>
* +----------------------------------------------------------------------
* 所有的前端controller层的拦截业务，方法的执行时间长度，
*/
@Aspect
@Component
public class ControllerAspect {
Logger logger = LoggerFactory.getLogger(ControllerAspect.class);
@Pointcut("execution(* com.zbkj.admin.controller.*.*(..))")
private void pointCutMethodController() {
}
@Around("pointCutMethodController()")
public Object doAroundService(ProceedingJoinPoint pjp) throws Throwable {
long begin = System.nanoTime();
Object obj = pjp.proceed();
long end = System.nanoTime();
logger.info("Controller method：{}，prams：{}，cost time：{} ns，cost：{} ms",
pjp.getSignature().toString(), Arrays.toString(pjp.getArgs()), (end - begin), (end - begin) / 1000000);
return obj;
}
}

14
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/CorsConfig.java
View File

@@ -10,7 +10,7 @@ import org.springframework.web.filter.CorsFilter;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -21,20 +21,16 @@ import org.springframework.web.filter.CorsFilter;
public class CorsConfig{
private CorsConfiguration buildConfig() {
CorsConfiguration corsConfiguration = new CorsConfiguration();
//允许任何域名
corsConfiguration.addAllowedOrigin("*");
//允许任何头
corsConfiguration.addAllowedHeader("*");
//允许任何方法
corsConfiguration.addAllowedMethod("*");
corsConfiguration.addAllowedOrigin("*"); //允许任何域名
corsConfiguration.addAllowedHeader("*"); //允许任何头
corsConfiguration.addAllowedMethod("*"); //允许任何方法
return corsConfiguration;
}
@Bean
public CorsFilter corsFilter() {
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
//注册
source.registerCorsConfiguration("/**", buildConfig());
source.registerCorsConfiguration("/**", buildConfig()); //注册
return new CorsFilter(source);
}
}

10
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/DruidConfig.java
View File

@@ -16,7 +16,7 @@ import javax.sql.DataSource;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -35,18 +35,20 @@ public class DruidConfig {
servletRegistrationBean.addInitParameter("loginUsername", "kf"); // 用户名
servletRegistrationBean.addInitParameter("loginPassword", "654321"); // 密码
servletRegistrationBean.addInitParameter("resetEnable", "true"); // 是否可以重置数据源
return servletRegistrationBean ;
return servletRegistrationBean;
}
@Bean
public FilterRegistrationBean filterRegistrationBean() {
FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean() ;
FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean();
filterRegistrationBean.setFilter(new WebStatFilter());
filterRegistrationBean.addUrlPatterns("/*"); // 所有请求进行监控处理
//不必监控的请求
filterRegistrationBean.addInitParameter("exclusions", "*.html,*.png,*.ico,*.js,*.gif,*.jpg,*.css,/druid/*");
return filterRegistrationBean ;
return filterRegistrationBean;
}
@Bean("dataSource")
@ConfigurationProperties(prefix = "spring.datasource")
public DataSource druidDataSource() {

2
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/JacksonConfig.java
View File

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

2
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/RestTemplateConfig.java
View File

@@ -18,7 +18,7 @@ import java.util.List;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

2
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/SchedulerConfig.java
View File

@@ -11,7 +11,7 @@ import org.springframework.scheduling.config.ScheduledTaskRegistrar;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

2
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/SwaggerConfig.java
View File

@@ -25,7 +25,7 @@ import static com.google.common.collect.Lists.newArrayList;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

2
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/TaskExecutorConfig.java
View File

@@ -13,7 +13,7 @@ import java.util.concurrent.ThreadPoolExecutor;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

23
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/WebConfig.java
View File

@@ -1,9 +1,10 @@
package com.zbkj.admin.config;
import com.zbkj.common.constants.Constants;
import com.zbkj.common.constants.UploadConstants;
import com.zbkj.common.interceptor.SwaggerInterceptor;
import com.zbkj.admin.filter.ResponseFilter;
import com.zbkj.common.config.CrmebConfig;
import com.zbkj.common.constants.Constants;
import com.zbkj.common.interceptor.SwaggerInterceptor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -15,12 +16,14 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.handler.MappedInterceptor;
import java.io.File;
/**
* token验证拦截器
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -90,17 +93,21 @@ public class WebConfig implements WebMvcConfigurer {
.addResourceLocations("classpath:/META-INF/resources/webjars/");
/** 本地文件上传路径 */
registry.addResourceHandler(Constants.UPLOAD_TYPE_IMAGE + "/**")
.addResourceLocations("file:" + crmebConfig.getImagePath() + "/" + Constants.UPLOAD_TYPE_IMAGE + "/");
registry.addResourceHandler(UploadConstants.UPLOAD_FILE_KEYWORD + "/**")
.addResourceLocations("file:" + crmebConfig.getImagePath() + "/" + UploadConstants.UPLOAD_FILE_KEYWORD + "/");
registry.addResourceHandler(UploadConstants.UPLOAD_AFTER_FILE_KEYWORD + "/**")
.addResourceLocations("file:" +crmebConfig.getImagePath() + "/" + UploadConstants.UPLOAD_AFTER_FILE_KEYWORD + "/" );
}
@Bean
public FilterRegistrationBean filterRegister() {
public FilterRegistrationBean filterRegister()
{
//注册过滤器
FilterRegistrationBean registration = new FilterRegistrationBean(responseFilter());
// 仅仅api前缀的请求才会拦截
registration.addUrlPatterns("/api/admin/*");
registration.addUrlPatterns("/api/front/*");
registration.addUrlPatterns("/api/*");
return registration;
}

25
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/WebSecurityConfig.java
View File

@@ -5,6 +5,7 @@ import com.zbkj.admin.manager.AuthenticationEntryPointImpl;
import com.zbkj.admin.manager.CustomAccessDeniedHandler;
import com.zbkj.admin.manager.CustomAuthenticationProvider;
import com.zbkj.common.constants.Constants;
import com.zbkj.common.constants.UploadConstants;
import com.zbkj.service.service.impl.UserDetailServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
@@ -25,7 +26,7 @@ import org.springframework.web.filter.CorsFilter;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -77,7 +78,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
// }
@Override
protected void configure(AuthenticationManagerBuilder auth) {
protected void configure(AuthenticationManagerBuilder auth) throws Exception {
auth.authenticationProvider(new CustomAuthenticationProvider(new UserDetailServiceImpl()));
}
@@ -110,16 +111,18 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.authorizeRequests()
// 跨域预检请求
// .antMatchers(HttpMethod.OPTIONS, "/**").permitAll()
// 对于登录login 验证码captchaImage 和其他放行的目录 允许匿名访问"/citylife/front/**"
.antMatchers("/api/admin/login", "/api/admin/validate/code/get").permitAll()
.antMatchers("/api/admin/getLoginPic").permitAll()
// 对于登录login 验证码captchaImage 和其他放行的目录 允许匿名访问"/citylife/front/**"
.antMatchers("/api/admin/login", "/api/admin/validate/code/get").permitAll()
.antMatchers("/api/admin/getLoginPic").permitAll()
.antMatchers("/api/admin/login/account/detection").permitAll()
.antMatchers("/api/admin/validate/code/getcaptchaconfig").permitAll()
// 放行资源路径
.antMatchers("/"+ Constants.UPLOAD_TYPE_IMAGE +"/**").anonymous()
.antMatchers("/"+ UploadConstants.UPLOAD_FILE_KEYWORD +"/**").permitAll()
.antMatchers("/"+ UploadConstants.DOWNLOAD_FILE_KEYWORD +"/**").permitAll()
.antMatchers("/"+ UploadConstants.UPLOAD_AFTER_FILE_KEYWORD +"/**").permitAll()
// 放行图片、文件上传
.antMatchers("/api/admin/upload/image").permitAll()
.antMatchers("/api/admin/upload/file").permitAll()
// 代码生成器
.antMatchers("/api/codegen/code").permitAll()
.antMatchers("/api/admin/upload/image").permitAll()
.antMatchers("/api/admin/upload/file").permitAll()
// .antMatchers("/wx/user/*/login","/citylife/nocheck/**").anonymous()
.antMatchers(
HttpMethod.GET,
@@ -140,7 +143,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.antMatchers("/druid/**").anonymous()
.antMatchers("/captcha/get", "/captcha/check").anonymous()
.antMatchers("/api/admin/payment/callback/**").anonymous()
.antMatchers("/api/public/**").anonymous()
.antMatchers("/api/public/**").permitAll()
// 除上面外的所有请求全部需要鉴权认证
.anyRequest().authenticated()
.and()

39
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/AdminLoginController.java
View File

@@ -1,12 +1,15 @@
package com.zbkj.admin.controller;
import com.zbkj.admin.service.AdminLoginService;
import com.zbkj.common.request.AdminAccountDetectionRequest;
import com.zbkj.common.request.LoginAdminUpdatePasswordRequest;
import com.zbkj.common.request.LoginAdminUpdateRequest;
import com.zbkj.common.request.SystemAdminLoginRequest;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.response.MenusResponse;
import com.zbkj.common.response.SystemAdminResponse;
import com.zbkj.common.response.SystemLoginResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.common.utils.CrmebUtil;
import com.zbkj.admin.service.AdminLoginService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -24,7 +27,7 @@ import java.util.Map;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -45,7 +48,7 @@ public class AdminLoginController {
public CommonResult<SystemLoginResponse> SystemAdminLogin(@RequestBody @Validated SystemAdminLoginRequest systemAdminLoginRequest, HttpServletRequest request) {
String ip = CrmebUtil.getClientIp(request);
SystemLoginResponse systemAdminResponse = adminLoginService.login(systemAdminLoginRequest, ip);
return CommonResult.success(systemAdminResponse, "login success");
return CommonResult.success(systemAdminResponse);
}
@PreAuthorize("hasAuthority('admin:logout')")
@@ -53,7 +56,7 @@ public class AdminLoginController {
@GetMapping(value = "/logout")
public CommonResult<SystemAdminResponse> SystemAdminLogout() {
adminLoginService.logout();
return CommonResult.success("logout success");
return CommonResult.success();
}
@PreAuthorize("hasAuthority('admin:info')")
@@ -83,4 +86,30 @@ public class AdminLoginController {
return CommonResult.success(adminLoginService.getMenus());
}
@ApiOperation(value="账号登录检测")
@RequestMapping(value = "/login/account/detection", method = RequestMethod.POST)
public CommonResult<Integer> accountDetection(@RequestBody @Validated AdminAccountDetectionRequest request) {
return CommonResult.success(adminLoginService.accountDetection(request.getAccount()));
}
@PreAuthorize("hasAuthority('admin:update:name')")
@ApiOperation(value="修改登录用户信息")
@RequestMapping(value = "/login/admin/update", method = RequestMethod.POST)
public CommonResult<SystemLoginResponse> loginAdminUpdate(@RequestBody @Validated LoginAdminUpdateRequest request) {
if (adminLoginService.loginAdminUpdate(request)) {
return CommonResult.success();
}
return CommonResult.failed();
}
@PreAuthorize("hasAuthority('admin:update:password')")
@ApiOperation(value="修改登录用户密码")
@RequestMapping(value = "/login/update/password", method = RequestMethod.POST)
public CommonResult<SystemLoginResponse> loginAdminUpdatePwd(@RequestBody @Validated LoginAdminUpdatePasswordRequest request) {
if (adminLoginService.loginAdminUpdatePwd(request)) {
return CommonResult.success();
}
return CommonResult.failed();
}
}

4
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ArticleController.java
View File

@@ -5,7 +5,7 @@ import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.ArticleRequest;
import com.zbkj.common.request.ArticleSearchRequest;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.result.CommonResult;
import com.zbkj.common.vo.ArticleVo;
import com.zbkj.service.service.ArticleService;
import io.swagger.annotations.Api;
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

2
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/CallbackController.java
View File

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

14
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/CategoryController.java
View File

@@ -6,7 +6,7 @@ import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.CategoryRequest;
import com.zbkj.common.request.CategorySearchRequest;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.result.CommonResult;
import com.zbkj.common.utils.CrmebUtil;
import com.zbkj.common.vo.CategoryTreeVo;
import com.zbkj.service.service.CategoryService;
@@ -29,7 +29,7 @@ import java.util.List;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -49,18 +49,16 @@ public class CategoryController {
private SystemAttachmentService systemAttachmentService;
/**
* 分页显示分类表
* 显示分类表
* @param request 搜索条件
* @param pageParamRequest 分页参数
* @author Mr.Zhang
* @since 2020-04-16
*/
@PreAuthorize("hasAuthority('admin:category:list')")
@ApiOperation(value = "分页分类列表")
@ApiOperation(value = "分类列表")
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<Category>> getList(@ModelAttribute CategorySearchRequest request, @ModelAttribute PageParamRequest pageParamRequest) {
CommonPage<Category> categoryCommonPage = CommonPage.restPage(categoryService.getList(request, pageParamRequest));
return CommonResult.success(categoryCommonPage);
public CommonResult<List<Category>> getList(@ModelAttribute CategorySearchRequest request) {
return CommonResult.success(categoryService.getList(request));
}
/**

71
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/CodeGenerator.java
View File

@@ -1,71 +0,0 @@
package com.zbkj.admin.controller;
import com.zbkj.common.constants.Constants;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.utils.DateUtil;
import com.zbkj.common.utils.genutils.GenCodePageListUtils;
import com.zbkj.common.utils.genutils.GenCodePageQueryUtils;
import com.zbkj.service.service.impl.CrmebGeneratorCodeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
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.ResponseBody;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Date;
import java.util.Map;
/**
* 前后端代码生成器 controller
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
* | Author: CRMEB Team <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Controller
@RequestMapping("api/codegen")
@Api(tags = "代码生成")
public class CodeGenerator {
@Autowired
private CrmebGeneratorCodeService crmebGeneratorCodeService;
@ResponseBody
@ApiOperation(value="代码生成-新列表")
@GetMapping("/list")
public CommonResult<Object> listNew(@RequestParam Map<String, Object> params){
GenCodePageListUtils pageUtil = crmebGeneratorCodeService.queryList(new GenCodePageQueryUtils(params));
return CommonResult.success(pageUtil);
}
/**
* 生成代码 API
*/
@GetMapping("/code")
public void code(@RequestParam String tables, HttpServletResponse response) throws IOException {
byte[] data = crmebGeneratorCodeService.generatorCode(tables.split(","));
String contentLength = "Content-Length";
String contentType = "application/octet-stream; charset=UTF-8;";
String contentDisposition = "Content-Disposition";
String attachment = "attachment; filename=\"CRMEB-Java-Code-"+ DateUtil.dateToStr(new Date(), Constants.DATE_FORMAT_HHMM) +".zip\"";
response.reset();
response.addHeader(contentLength, data.length +"");
response.setContentType(contentType);
response.setHeader(contentDisposition, attachment);
IOUtils.write(data, response.getOutputStream());
}
}

4
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ExcelController.java
View File

@@ -5,7 +5,7 @@ import com.zbkj.common.request.StoreBargainSearchRequest;
import com.zbkj.common.request.StoreCombinationSearchRequest;
import com.zbkj.common.request.StoreOrderSearchRequest;
import com.zbkj.common.request.StoreProductSearchRequest;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.ExcelService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -25,7 +25,7 @@ import java.util.HashMap;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

34
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ExpressController.java
View File

@@ -1,22 +1,22 @@
package com.zbkj.admin.controller;
import com.alibaba.fastjson.JSONObject;
import com.zbkj.common.model.express.Express;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.ExpressUpdateRequest;
import com.zbkj.common.request.ExpressSearchRequest;
import com.zbkj.common.request.ExpressUpdateRequest;
import com.zbkj.common.request.ExpressUpdateShowRequest;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.ExpressService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.zbkj.common.model.express.Express;
import java.util.List;
@@ -26,7 +26,7 @@ import java.util.List;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -51,8 +51,8 @@ public class ExpressController {
@ApiOperation(value = "分页列表")
@RequestMapping(value = "/list", method = RequestMethod.GET)
@ApiImplicitParam(name="keywords", value="搜索关键字")
public CommonResult<CommonPage<Express>> getList(@Validated ExpressSearchRequest request,
@ModelAttribute PageParamRequest pageParamRequest) {
public CommonResult<CommonPage<Express>> getList(@Validated ExpressSearchRequest request,
@ModelAttribute PageParamRequest pageParamRequest) {
CommonPage<Express> expressCommonPage = CommonPage.restPage(expressService.getList(request, pageParamRequest));
return CommonResult.success(expressCommonPage);
}
@@ -91,9 +91,11 @@ public class ExpressController {
@RequestMapping(value = "/sync/express", method = RequestMethod.POST)
public CommonResult<String> syncExpress() {
if (expressService.syncExpress()) {
return CommonResult.success();
CommonResult<String> success = CommonResult.success();
success.setMessage("同步物流公司成功");
return success;
}
return CommonResult.failed();
return CommonResult.failed("同步物流公司失败");
}
@@ -130,6 +132,16 @@ public class ExpressController {
public CommonResult<JSONObject> template(@RequestParam(value = "com") String com) {
return CommonResult.success(expressService.template(com));
}
// /**
// * 获取电子面单模版
// */
// @ApiOperation(value = "查询 电子面单 模版列表")
// @RequestMapping(value = "/templatedianzi", method = RequestMethod.GET)
// @ApiImplicitParam(name="com", value="快递公司编号", required = true)
// public CommonResult<JSONObject> templateDZ(@RequestParam(value = "com") String com) {
// return CommonResult.success(expressService.templateFor(com));
// }
}

10
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/FundsMonitorController.java
View File

@@ -1,12 +1,12 @@
package com.zbkj.admin.controller;
import com.zbkj.common.model.user.UserBrokerageRecord;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.BrokerageRecordRequest;
import com.zbkj.common.request.FundsMonitorRequest;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.response.MonitorResponse;
import com.zbkj.common.model.user.UserBrokerageRecord;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.UserBillService;
import com.zbkj.service.service.UserFundsMonitorService;
import io.swagger.annotations.Api;
@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -52,7 +52,7 @@ public class FundsMonitorController {
@PreAuthorize("hasAuthority('admin:finance:monitor:list')")
@ApiOperation(value = "资金监控")
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<MonitorResponse>> getList(@Validated FundsMonitorRequest request, @Validated PageParamRequest pageParamRequest){
public CommonResult<CommonPage<MonitorResponse>> getList(@Validated FundsMonitorRequest request, @Validated PageParamRequest pageParamRequest){
CommonPage<MonitorResponse> userExtractCommonPage = CommonPage.restPage(userBillService.fundMonitoring(request, pageParamRequest));
return CommonResult.success(userExtractCommonPage);
}

15
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/HomeController.java
View File

@@ -1,7 +1,8 @@
package com.zbkj.admin.controller;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.response.HomeOperatingDataResponse;
import com.zbkj.common.response.HomeRateResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.HomeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -20,7 +21,7 @@ import java.util.Map;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -102,6 +103,16 @@ public class HomeController {
public CommonResult<Map<String, Object>> chartOrderInYear() {
return CommonResult.success(homeService.chartOrderInYear());
}
/**
* 首页经营数据
*/
@PreAuthorize("hasAuthority('admin:statistics:home:operating:data')")
@ApiOperation(value = "经营数据")
@RequestMapping(value = "/operating/data", method = RequestMethod.GET)
public CommonResult<HomeOperatingDataResponse> operatingData() {
return CommonResult.success(homeService.operatingData());
}
}

188
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/OnePassController.java
View File

@@ -1,27 +1,27 @@
package com.zbkj.admin.controller;
import com.alibaba.fastjson.JSONObject;
import com.zbkj.common.request.*;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.onepass.OnePassLoginRequest;
import com.zbkj.common.request.onepass.OnePassShipmentCancelOrderRequest;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.OnePassService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
/**
* 一号通控制器
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -37,160 +37,40 @@ public class OnePassController {
@Autowired
private OnePassService onePassService;
/**
* 获取用户验证码
* @param phone 手机号码
*/
@PreAuthorize("hasAuthority('admin:pass:send:code')")
@ApiOperation(value = "获取用户验证码")
@RequestMapping(value = "/sendUserCode", method = RequestMethod.GET)
@ApiImplicitParams({
@ApiImplicitParam(name="phone", value="手机号"),
@ApiImplicitParam(name="types", value="验证码类型1:修改，0:注册")
})
public CommonResult<Object> sendUserCode(@RequestParam(name = "phone") String phone,@RequestParam(name = "types", required = false) Integer types) {
return CommonResult.success(onePassService.sendUserCode(phone, types));
@PreAuthorize("hasAuthority('admin:pass:appsave')")
@ApiOperation(value = "一号通 应用保存")
@RequestMapping(value = "/appsave", method = RequestMethod.POST)
public CommonResult<Boolean> saveOnePassApplication(@Validated @RequestBody OnePassLoginRequest request) {
return CommonResult.success(onePassService.saveOnePassApplicationInfo(request));
}
/**
* 账号注册
* @param registerRequest 注册参数
*/
@PreAuthorize("hasAuthority('admin:pass:register')")
@ApiOperation(value = "账号注册")
@RequestMapping(value = "/register", method = RequestMethod.POST)
public CommonResult<String> register(@Validated @RequestBody OnePassRegisterRequest registerRequest) {
return CommonResult.success(onePassService.register(registerRequest));
@PreAuthorize("hasAuthority('admin:pass:appget')")
@ApiOperation(value = "一号通 应用详情获取")
@RequestMapping(value = "/appget", method = RequestMethod.GET)
public CommonResult<OnePassLoginRequest> getOnePassApplication() {
return CommonResult.success(onePassService.getOnePassApplicationInfo());
}
/**
* 一号通用户登录
* @return
*/
@PreAuthorize("hasAuthority('admin:pass:login')")
@ApiOperation(value = "一号通用户登录")
@RequestMapping(value = "/login", method = RequestMethod.POST)
public CommonResult<Map<String, Object>> account(@Validated @RequestBody OnePassLoginRequest request) {
return CommonResult.success(onePassService.login(request));
@PreAuthorize("hasAuthority('admin:pass:shipment:cancel')")
@ApiOperation(value = "一号通 取消商家寄件")
@RequestMapping(value = "/shipment/cancel", method = RequestMethod.POST)
public CommonResult<JSONObject> onePassShipmentCancel(OnePassShipmentCancelOrderRequest request) {
return CommonResult.success(onePassService.shipmentCancelOrder(request));
}
/**
* 判断是否已经登录
* @return
*/
@PreAuthorize("hasAuthority('admin:pass:is:login')")
@ApiOperation(value = "是否已经登录")
@RequestMapping(value = "/isLogin", method = RequestMethod.GET)
public CommonResult<Map<String, Object>> isLogin() {
return CommonResult.success(onePassService.isLogin());
@PreAuthorize("hasAuthority('admin:pass:shipment:express')")
@ApiOperation(value = "一号通 商家寄件 快递列表")
@RequestMapping(value = "/shipment/express", method = RequestMethod.GET)
public CommonResult<JSONObject> onePassShipmentExpress() {
return CommonResult.success(onePassService.shipmentComs());
}
/**
* 一号通用户信息
*/
@PreAuthorize("hasAuthority('admin:pass:info')")
@ApiOperation(value = "一号通用户信息")
@RequestMapping(value = "/info", method = RequestMethod.GET)
public CommonResult<JSONObject> getInfo() {
return CommonResult.success(onePassService.info());
@PreAuthorize("hasAuthority('admin:pass:shipment:callback')")
@ApiOperation(value = "一号通 商家寄件 回调地址")
@RequestMapping(value = "/shipment/callback", method = RequestMethod.POST)
public CommonResult<Boolean> onePassShipmentCallBack(String type, String data) {
return CommonResult.success(onePassService.shipmentCallBackMethod(type, data));
}
/**
* 注销当前登录
* @return result
*/
@PreAuthorize("hasAuthority('admin:pass:logout')")
@ApiOperation(value = "注销")
@RequestMapping(value = "/logout", method = RequestMethod.GET)
public CommonResult<JSONObject> logOut() {
if (onePassService.logOut()) {
return CommonResult.success();
}
return CommonResult.failed();
}
/**
* 修改密码
* 手机号+验证码方式修改
*/
@PreAuthorize("hasAuthority('admin:pass:update:password')")
@ApiOperation(value = "修改密码")
@RequestMapping(value = "/update/password", method = RequestMethod.POST)
public CommonResult<JSONObject> updatePassword(@Validated @RequestBody OnePassUpdateRequest request) {
if (onePassService.updatePassword(request)) {
return CommonResult.success();
}
return CommonResult.failed();
}
/**
* 修改手机号——验证账号密码
*/
@PreAuthorize("hasAuthority('admin:pass:update:phone:validator')")
@ApiOperation(value = "修改手机号——验证账号密码")
@RequestMapping(value = "/update/phone/validator", method = RequestMethod.POST)
public CommonResult<JSONObject> updatePhone(@Validated @RequestBody OnePassLoginRequest request) {
if (onePassService.beforeUpdatePhoneValidator(request)) {
return CommonResult.success();
}
return CommonResult.failed();
}
/**
* 修改手机号
*/
@PreAuthorize("hasAuthority('admin:pass:update:phone')")
@ApiOperation(value = "修改手机号")
@RequestMapping(value = "/update/phone", method = RequestMethod.POST)
public CommonResult<JSONObject> updatePhone(@Validated @RequestBody OnePassUpdateRequest request) {
if (onePassService.updatePhone(request)) {
return CommonResult.success();
}
return CommonResult.failed();
}
/**
* 套餐列表
* @param type 套餐类型：sms,短信；expr_query,物流查询；expr_dump,电子面单；copy,产品复制
*/
@PreAuthorize("hasAuthority('admin:pass:meal:list')")
@ApiOperation(value = "套餐列表")
@RequestMapping(value = "/meal/list", method = RequestMethod.GET)
@ApiImplicitParam(name="type", value="套餐类型：sms,短信；expr_query,物流查询；expr_dump,电子面单；copy,产品复制")
public CommonResult<JSONObject> mealList(@Validated @RequestParam String type) {
return CommonResult.success(onePassService.mealList(type));
}
/**
* 套餐购买
*/
@PreAuthorize("hasAuthority('admin:pass:meal:code')")
@ApiOperation(value = "套餐购买")
@RequestMapping(value = "/meal/code", method = RequestMethod.POST)
public CommonResult<JSONObject> mealCode(@RequestBody @Validated MealCodeRequest request) {
return CommonResult.success(onePassService.mealCode(request));
}
/**
* 服务开通
*/
@PreAuthorize("hasAuthority('admin:pass:service:open')")
@ApiOperation(value = "服务开通")
@RequestMapping(value = "/service/open", method = RequestMethod.POST)
public CommonResult<JSONObject> serviceOpen(@RequestBody @Validated ServiceOpenRequest request) {
if (onePassService.serviceOpen(request)) {
return CommonResult.success();
}
return CommonResult.failed();
}
/**
* 用量记录
*/
@PreAuthorize("hasAuthority('admin:pass:user:record')")
@ApiOperation(value = "用量记录")
@RequestMapping(value = "/user/record", method = RequestMethod.GET)
public CommonResult<JSONObject> record(@Validated OnePassUserRecordRequest request) {
return CommonResult.success(onePassService.userRecord(request));
}
}

4
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/RetailShopController.java
View File

@@ -5,9 +5,9 @@ import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.RetailShopRequest;
import com.zbkj.common.request.RetailShopStairUserRequest;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.response.SpreadOrderResponse;
import com.zbkj.common.response.SpreadUserResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.RetailShopService;
import com.zbkj.service.service.UserService;
import io.swagger.annotations.Api;
@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.*;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

42
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesController.java
View File

@@ -1,27 +1,28 @@
package com.zbkj.admin.controller;
import com.zbkj.common.model.express.ShippingTemplates;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.ShippingTemplatesRequest;
import com.zbkj.common.request.ShippingTemplatesSearchRequest;
import com.zbkj.common.response.ShippingTemplatesInfoResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.ShippingTemplatesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import com.zbkj.common.model.express.ShippingTemplates;
/**
* 物流-模板控制器
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -39,56 +40,60 @@ public class ShippingTemplatesController {
/**
* 分页显示
* @param request 搜索条件
*
* @param request 搜索条件
* @param pageParamRequest 分页参数
*/
@PreAuthorize("hasAuthority('admin:shipping:templates:list')")
@ApiOperation(value = "分页列表")
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<ShippingTemplates>> getList(@Validated ShippingTemplatesSearchRequest request, @Validated PageParamRequest pageParamRequest){
public CommonResult<CommonPage<ShippingTemplates>> getList(@Validated ShippingTemplatesSearchRequest request, @Validated PageParamRequest pageParamRequest) {
CommonPage<ShippingTemplates> shippingTemplatesCommonPage = CommonPage.restPage(shippingTemplatesService.getList(request, pageParamRequest));
return CommonResult.success(shippingTemplatesCommonPage);
}
/**
* 新增
*
* @param request 新增参数
*/
@PreAuthorize("hasAuthority('admin:shipping:templates:save')")
@ApiOperation(value = "新增")
@RequestMapping(value = "/save", method = RequestMethod.POST)
public CommonResult<String> save(@RequestBody @Validated ShippingTemplatesRequest request){
public CommonResult<String> save(@RequestBody @Validated ShippingTemplatesRequest request) {
if (shippingTemplatesService.create(request)) {
return CommonResult.success();
return CommonResult.success("新增运费模板成功");
}
return CommonResult.failed("新增运费模板失败");
}
/**
* 删除
*
* @param id Integer
*/
@PreAuthorize("hasAuthority('admin:shipping:templates:delete')")
@ApiOperation(value = "删除")
@RequestMapping(value = "/delete", method = RequestMethod.GET)
@ApiImplicitParam(name="id", value="模板ID", required = true)
public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
if(shippingTemplatesService.remove(id)){
@ApiImplicitParam(name = "id", value = "模板ID", required = true)
public CommonResult<String> delete(@RequestParam(value = "id") Integer id) {
if (shippingTemplatesService.remove(id)) {
return CommonResult.success();
}else{
} else {
return CommonResult.failed();
}
}
/**
* 修改
* @param id integer id
*
* @param id integer id
* @param request ShippingTemplatesRequest 修改参数
*/
@PreAuthorize("hasAuthority('admin:shipping:templates:update')")
@ApiOperation(value = "修改")
@RequestMapping(value = "/update", method = RequestMethod.POST)
public CommonResult<String> update(@RequestParam Integer id, @RequestBody @Validated ShippingTemplatesRequest request){
public CommonResult<String> update(@RequestParam Integer id, @RequestBody @Validated ShippingTemplatesRequest request) {
if (shippingTemplatesService.update(id, request)) {
return CommonResult.success();
}
@@ -97,15 +102,16 @@ public class ShippingTemplatesController {
/**
* 查询信息
*
* @param id Integer
*/
@PreAuthorize("hasAuthority('admin:shipping:templates:info')")
@ApiOperation(value = "详情")
@RequestMapping(value = "/info", method = RequestMethod.GET)
@ApiImplicitParam(name="id", value="模板ID", required = true)
public CommonResult<ShippingTemplates> info(@RequestParam(value = "id") Integer id){
@ApiImplicitParam(name = "id", value = "模板ID", required = true)
public CommonResult<ShippingTemplatesInfoResponse> info(@RequestParam(value = "id") Integer id) {
return CommonResult.success(shippingTemplatesService.getInfo(id));
}
}
}

8
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesFreeController.java
View File

@@ -1,7 +1,7 @@
package com.zbkj.admin.controller;
import com.zbkj.common.request.ShippingTemplatesFreeRequest;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.response.ShippingTemplatesFreeResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.ShippingTemplatesFreeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -20,7 +20,7 @@ import java.util.List;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -43,7 +43,7 @@ public class ShippingTemplatesFreeController {
@PreAuthorize("hasAuthority('admin:shipping:templates:free:list')")
@ApiOperation(value = "根据模板id查询数据")
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<List<ShippingTemplatesFreeRequest>> getList(@RequestParam Integer tempId){
public CommonResult<List<ShippingTemplatesFreeResponse>> getList(@RequestParam Integer tempId){
return CommonResult.success(shippingTemplatesFreeService.getListGroup(tempId));
}

8
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ShippingTemplatesRegionController.java
View File

@@ -1,7 +1,7 @@
package com.zbkj.admin.controller;
import com.zbkj.common.request.ShippingTemplatesRegionRequest;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.response.ShippingTemplatesRegionResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.ShippingTemplatesRegionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -20,7 +20,7 @@ import java.util.List;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -43,7 +43,7 @@ public class ShippingTemplatesRegionController {
@PreAuthorize("hasAuthority('admin:shipping:templates:region:list')")
@ApiOperation(value = "根据模板id查询数据")
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<List<ShippingTemplatesRegionRequest>> getList(@RequestParam Integer tempId){
public CommonResult<List<ShippingTemplatesRegionResponse>> getList(@RequestParam Integer tempId){
return CommonResult.success(shippingTemplatesRegionService.getListGroup(tempId));
}
}

6
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SmsRecordController.java
View File

@@ -1,11 +1,11 @@
package com.zbkj.admin.controller;
import com.alibaba.fastjson.JSONObject;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.vo.MyRecord;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.SmsApplyTempRequest;
import com.zbkj.common.request.SmsModifySignRequest;
import com.zbkj.common.result.CommonResult;
import com.zbkj.common.vo.MyRecord;
import com.zbkj.service.service.SmsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -24,7 +24,7 @@ import java.util.Map;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

6
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreBargainController.java
View File

@@ -1,7 +1,6 @@
package com.zbkj.admin.controller;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.StoreBargainRequest;
import com.zbkj.common.request.StoreBargainSearchRequest;
@@ -10,6 +9,7 @@ import com.zbkj.common.response.StoreBargainResponse;
import com.zbkj.common.response.StoreBargainUserHelpResponse;
import com.zbkj.common.response.StoreBargainUserResponse;
import com.zbkj.common.response.StoreProductInfoResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.StoreBargainService;
import com.zbkj.service.service.StoreBargainUserHelpService;
import com.zbkj.service.service.StoreBargainUserService;
@@ -29,7 +29,7 @@ import java.util.List;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -59,7 +59,7 @@ public class StoreBargainController {
@PreAuthorize("hasAuthority('admin:bargain:list')")
@ApiOperation(value = "分页显示砍价商品列表") //配合swagger使用
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<StoreBargainResponse>> getList(@Validated StoreBargainSearchRequest request, @Validated PageParamRequest pageParamRequest){
public CommonResult<CommonPage<StoreBargainResponse>> getList(@Validated StoreBargainSearchRequest request, @Validated PageParamRequest pageParamRequest){
CommonPage<StoreBargainResponse> storeBargainCommonPage = CommonPage.restPage(storeBargainService.getList(request, pageParamRequest));
return CommonResult.success(storeBargainCommonPage);
}

4
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreCombinationController.java
View File

@@ -1,7 +1,6 @@
package com.zbkj.admin.controller;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.StoreCombinationRequest;
import com.zbkj.common.request.StoreCombinationSearchRequest;
@@ -10,6 +9,7 @@ import com.zbkj.common.response.StoreCombinationResponse;
import com.zbkj.common.response.StorePinkAdminListResponse;
import com.zbkj.common.response.StorePinkDetailResponse;
import com.zbkj.common.response.StoreProductInfoResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.StoreCombinationService;
import com.zbkj.service.service.StorePinkService;
import io.swagger.annotations.Api;
@@ -28,7 +28,7 @@ import java.util.Map;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

10
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreCouponController.java
View File

@@ -1,13 +1,13 @@
package com.zbkj.admin.controller;
import com.zbkj.common.model.coupon.StoreCoupon;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.SearchAndPageRequest;
import com.zbkj.common.model.coupon.StoreCoupon;
import com.zbkj.common.request.StoreCouponRequest;
import com.zbkj.common.request.StoreCouponSearchRequest;
import com.zbkj.common.response.StoreCouponInfoResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.StoreCouponService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -48,7 +48,7 @@ public class StoreCouponController {
@PreAuthorize("hasAuthority('admin:coupon:list')")
@ApiOperation(value = "分页列表")
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<StoreCoupon>> getList(@Validated StoreCouponSearchRequest request, @Validated PageParamRequest pageParamRequest) {
public CommonResult<CommonPage<StoreCoupon>> getList(@Validated StoreCouponSearchRequest request, @Validated PageParamRequest pageParamRequest) {
CommonPage<StoreCoupon> storeCouponCommonPage = CommonPage.restPage(storeCouponService.getList(request, pageParamRequest));
return CommonResult.success(storeCouponCommonPage);
}
@@ -116,7 +116,7 @@ public class StoreCouponController {
@RequestMapping(value = "/delete", method = RequestMethod.POST)
public CommonResult<StoreCouponInfoResponse> delete(@RequestParam Integer id) {
if (storeCouponService.delete(id)) {
return CommonResult.success("删除成功");
return CommonResult.success();
} else {
return CommonResult.failed("删除失败");
}

14
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreCouponUserController.java
View File

@@ -1,19 +1,21 @@
package com.zbkj.admin.controller;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.StoreCouponUserRequest;
import com.zbkj.common.request.StoreCouponUserSearchRequest;
import com.zbkj.common.response.StoreCouponUserResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.StoreCouponUserService;
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.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
/**
@@ -21,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -45,7 +47,7 @@ public class StoreCouponUserController {
@PreAuthorize("hasAuthority('admin:coupon:user:list')")
@ApiOperation(value = "分页列表")
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<StoreCouponUserResponse>> getList(@Validated StoreCouponUserSearchRequest request, @Validated PageParamRequest pageParamRequest) {
public CommonResult<CommonPage<StoreCouponUserResponse>> getList(@Validated StoreCouponUserSearchRequest request, @Validated PageParamRequest pageParamRequest) {
CommonPage<StoreCouponUserResponse> storeCouponUserCommonPage = CommonPage.restPage(storeCouponUserService.getList(request, pageParamRequest));
return CommonResult.success(storeCouponUserCommonPage);
}

27
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreOrderController.java
View File

@@ -3,6 +3,7 @@ package com.zbkj.admin.controller;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.*;
import com.zbkj.common.response.*;
import com.zbkj.common.result.CommonResult;
import com.zbkj.common.vo.ExpressSheetVo;
import com.zbkj.common.vo.LogisticsResultVo;
import com.zbkj.service.service.StoreOrderService;
@@ -25,7 +26,7 @@ import java.util.List;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -64,8 +65,9 @@ public class StoreOrderController {
@RequestMapping(value = "/status/num", method = RequestMethod.GET)
public CommonResult<StoreOrderCountItemResponse> getOrderStatusNum(
@RequestParam(value = "dateLimit", defaultValue = "") String dateLimit,
@RequestParam(value = "type", defaultValue = "2") @Range(min = 0, max = 2, message = "未知的订单类型") Integer type) {
return CommonResult.success(storeOrderService.getOrderStatusNum(dateLimit, type));
@RequestParam(value = "type", defaultValue = "2") @Range(min = 0, max = 2, message = "未知的订单类型") Integer type,
@RequestParam(value = "orderId", defaultValue = "") String orderNo) {
return CommonResult.success(storeOrderService.getOrderStatusNum(dateLimit, type, orderNo));
}
/**
@@ -137,11 +139,8 @@ public class StoreOrderController {
@PreAuthorize("hasAuthority('admin:order:send')")
@ApiOperation(value = "发送货")
@RequestMapping(value = "/send", method = RequestMethod.POST)
public CommonResult<Boolean> send(@RequestBody @Validated StoreOrderSendRequest request) {
if (storeOrderService.send(request)) {
return CommonResult.success();
}
return CommonResult.failed();
public CommonResult<String> send(@RequestBody @Validated StoreOrderSendRequest request) {
return CommonResult.success(storeOrderService.send(request));
}
/**
@@ -150,7 +149,7 @@ public class StoreOrderController {
@PreAuthorize("hasAuthority('admin:order:refund')")
@ApiOperation(value = "退款")
@RequestMapping(value = "/refund", method = RequestMethod.GET)
public CommonResult<Boolean> send(@Validated StoreOrderRefundRequest request) {
public CommonResult<Boolean> refund(@Validated StoreOrderRefundRequest request) {
return CommonResult.success(storeOrderService.refund(request));
}
@@ -260,6 +259,16 @@ public class StoreOrderController {
return CommonResult.success(storeOrderService.getDeliveryInfo());
}
@PreAuthorize("hasAuthority('admin:order:tracking:number:update')")
@ApiOperation(value = "更改订单运单号")
@RequestMapping(value = "/update/tracking/number", method = RequestMethod.POST)
public CommonResult<Boolean> updateTrackingNumber(@RequestBody @Validated StoreOrderSendRequest request) {
if (storeOrderService.updateTrackingNumber(request)) {
return CommonResult.success();
}
return CommonResult.failed();
}
}

12
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreOrderStatusController.java
View File

@@ -1,10 +1,10 @@
package com.zbkj.admin.controller;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.model.order.StoreOrderStatus;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.StoreOrderStatusSearchRequest;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.StoreOrderStatusService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -47,8 +47,8 @@ public class StoreOrderStatusController {
@PreAuthorize("hasAuthority('admin:order:status:list')")
@ApiOperation(value = "分页列表") //配合swagger使用
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<StoreOrderStatus>> getList(@Validated StoreOrderStatusSearchRequest request,
@Validated PageParamRequest pageParamRequest){
public CommonResult<CommonPage<StoreOrderStatus>> getList(@Validated StoreOrderStatusSearchRequest request,
@Validated PageParamRequest pageParamRequest){
CommonPage<StoreOrderStatus> storeOrderStatusCommonPage = CommonPage.restPage(storeOrderStatusService.getList(request, pageParamRequest));
return CommonResult.success(storeOrderStatusCommonPage);
}

35
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreProductController.java
View File

@@ -1,15 +1,12 @@
package com.zbkj.admin.controller;
import com.zbkj.common.model.product.StoreProduct;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.StoreCopyProductRequest;
import com.zbkj.common.request.StoreProductAddRequest;
import com.zbkj.common.request.StoreProductRequest;
import com.zbkj.common.request.StoreProductSearchRequest;
import com.zbkj.common.request.*;
import com.zbkj.common.response.StoreProductInfoResponse;
import com.zbkj.common.response.StoreProductResponse;
import com.zbkj.common.response.StoreProductTabsHeader;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.StoreCartService;
import com.zbkj.service.service.StoreProductService;
import io.swagger.annotations.Api;
@@ -34,7 +31,7 @@ import java.util.Map;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -66,6 +63,13 @@ public class StoreProductController {
return CommonResult.success(CommonPage.restPage(storeProductService.getAdminList(request, pageParamRequest)));
}
@PreAuthorize("hasAuthority('admin:product:listbyids')")
@ApiOperation(value = "根据id集合获取商品列表") //配合swagger使用
@RequestMapping(value = "/listids/{ids}", method = RequestMethod.GET)
public CommonResult<CommonPage<StoreProduct>> getListByIds(@PathVariable(value = "ids") List<Integer> ids) {
return CommonResult.success(CommonPage.restPage(storeProductService.getListInIds(ids)));
}
/**
* 新增商品
* @param request 新增参数
@@ -90,7 +94,7 @@ public class StoreProductController {
@RequestMapping(value = "/delete/{id}", method = RequestMethod.GET)
public CommonResult<String> delete(@RequestBody @PathVariable Integer id, @RequestParam(value = "type", required = false, defaultValue = "recycle")String type) {
if (storeProductService.deleteProduct(id, type)) {
if ("recycle".equals(type)) {
if (type.equals("recycle")) {
storeCartService.productStatusNotEnable(id);
} else {
storeCartService.productDelete(id);
@@ -148,8 +152,8 @@ public class StoreProductController {
@PreAuthorize("hasAuthority('admin:product:tabs:headers')")
@ApiOperation(value = "商品表头数量")
@RequestMapping(value = "/tabs/headers", method = RequestMethod.GET)
public CommonResult<List<StoreProductTabsHeader>> getTabsHeader() {
return CommonResult.success(storeProductService.getTabsHeader());
public CommonResult<List<StoreProductTabsHeader>> getTabsHeader(@Validated StoreProductHeaderRequest request) {
return CommonResult.success(storeProductService.getTabsHeader(request));
}
@@ -211,6 +215,17 @@ public class StoreProductController {
public CommonResult<Map<String, Object>> copyProduct(@RequestBody @Valid StoreCopyProductRequest request) {
return CommonResult.success(storeProductService.copyProduct(request.getUrl()));
}
@PreAuthorize("hasAuthority('admin:product:quick:stock:add')")
@ApiOperation(value = "快捷添加库存")
@RequestMapping(value = "/quick/stock/add", method = RequestMethod.POST)
public CommonResult<String> quickAddStock(@RequestBody @Validated ProductAddStockRequest request) {
if (storeProductService.quickAddStock(request)) {
return CommonResult.success();
}
return CommonResult.failed();
}
}

12
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreProductReplyController.java
View File

@@ -1,13 +1,13 @@
package com.zbkj.admin.controller;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.model.product.StoreProductReply;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.StoreProductReplyAddRequest;
import com.zbkj.common.request.StoreProductReplyCommentRequest;
import com.zbkj.common.request.StoreProductReplySearchRequest;
import com.zbkj.common.response.StoreProductReplyResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.StoreProductReplyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -47,8 +47,8 @@ public class StoreProductReplyController {
@PreAuthorize("hasAuthority('admin:product:reply:list')")
@ApiOperation(value = "分页列表") //配合swagger使用
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<StoreProductReplyResponse>> getList(@Validated StoreProductReplySearchRequest request,
@Validated PageParamRequest pageParamRequest) {
public CommonResult<CommonPage<StoreProductReplyResponse>> getList(@Validated StoreProductReplySearchRequest request,
@Validated PageParamRequest pageParamRequest) {
CommonPage<StoreProductReplyResponse> storeProductReplyCommonPage =
CommonPage.restPage(storeProductReplyService.getList(request, pageParamRequest));
return CommonResult.success(storeProductReplyCommonPage);

16
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreProductRuleController.java
View File

@@ -1,19 +1,19 @@
package com.zbkj.admin.controller;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.utils.CrmebUtil;
import com.zbkj.common.model.product.StoreProductRule;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.StoreProductRuleRequest;
import com.zbkj.common.request.StoreProductRuleSearchRequest;
import com.zbkj.common.result.CommonResult;
import com.zbkj.common.utils.CrmebUtil;
import com.zbkj.service.service.StoreProductRuleService;
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.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -46,7 +46,7 @@ public class StoreProductRuleController {
@PreAuthorize("hasAuthority('admin:product:rule:list')")
@ApiOperation(value = "分页列表") //配合swagger使用
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<StoreProductRule>> getList(
public CommonResult<CommonPage<StoreProductRule>> getList(
@Validated StoreProductRuleSearchRequest request, @Validated PageParamRequest pageParamRequest) {
CommonPage<StoreProductRule> storeProductRuleCommonPage =
CommonPage.restPage(storeProductRuleService.getList(request, pageParamRequest));

8
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreSeckillController.java
View File

@@ -1,12 +1,12 @@
package com.zbkj.admin.controller;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.StoreSeckillAddRequest;
import com.zbkj.common.request.StoreSeckillSearchRequest;
import com.zbkj.common.response.StoreSeckillResponse;
import com.zbkj.common.response.StoreProductInfoResponse;
import com.zbkj.common.response.StoreSeckillResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.StoreSeckillService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -46,7 +46,7 @@ public class StoreSeckillController {
@PreAuthorize("hasAuthority('admin:seckill:list')")
@ApiOperation(value = "分页列表") //配合swagger使用
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<StoreSeckillResponse>> getList(@Validated StoreSeckillSearchRequest request, @Validated PageParamRequest pageParamRequest) {
public CommonResult<CommonPage<StoreSeckillResponse>> getList(@Validated StoreSeckillSearchRequest request, @Validated PageParamRequest pageParamRequest) {
CommonPage<StoreSeckillResponse> storeSeckillCommonPage =
CommonPage.restPage(storeSeckillService.getList(request, pageParamRequest));
return CommonResult.success(storeSeckillCommonPage);

10
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreSeckillMangerController.java
View File

@@ -1,11 +1,11 @@
package com.zbkj.admin.controller;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.StoreSeckillMangerRequest;
import com.zbkj.common.request.StoreSeckillMangerSearchRequest;
import com.zbkj.common.response.StoreSeckillManagerResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.StoreSeckillMangerService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -47,7 +47,7 @@ public class StoreSeckillMangerController {
@PreAuthorize("hasAuthority('admin:seckill:manger:list')")
@ApiOperation(value = "分页列表") //配合swagger使用
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<StoreSeckillManagerResponse>> getList(
public CommonResult<CommonPage<StoreSeckillManagerResponse>> getList(
@Validated StoreSeckillMangerSearchRequest request, @Validated PageParamRequest pageParamRequest) {
return CommonResult.success(CommonPage.restPage(storeSeckillMangerService.getList(request, pageParamRequest)));
}
@@ -117,9 +117,9 @@ public class StoreSeckillMangerController {
@RequestMapping(value = "/update/status/{id}", method = RequestMethod.POST)
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "商品id", dataType = "int", required = true),
@ApiImplicitParam(name = "status", value = "状态", dataType = "boolean", required = true)
@ApiImplicitParam(name = "status", value = "状态", dataType = "string", required = true)
})
public CommonResult<Object> updateStatus(@PathVariable(value = "id") Integer id, Boolean status) {
public CommonResult<Object> updateStatus(@PathVariable(value = "id") Integer id, String status) {
return CommonResult.success(storeSeckillMangerService.updateStatus(id,status));
}

6
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemAdminController.java
View File

@@ -6,8 +6,8 @@ import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.SystemAdminAddRequest;
import com.zbkj.common.request.SystemAdminRequest;
import com.zbkj.common.request.SystemAdminUpdateRequest;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.response.SystemAdminResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.SystemAdminService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -25,7 +25,7 @@ import javax.validation.Valid;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -64,7 +64,7 @@ public class SystemAdminController {
@RequestMapping(value = "/save", method = RequestMethod.POST)
public CommonResult<SystemAdminResponse> save(@RequestBody SystemAdminAddRequest systemAdminAddRequest) {
if (systemAdminService.saveAdmin(systemAdminAddRequest)) {
return CommonResult.success("添加管理员成功");
return CommonResult.success();
}
return CommonResult.failed("添加管理员失败");
}

12
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemAttachmentController.java
View File

@@ -1,12 +1,12 @@
package com.zbkj.admin.controller;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.utils.CrmebUtil;
import com.zbkj.common.model.system.SystemAttachment;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.SystemAttachmentMoveRequest;
import com.zbkj.common.request.SystemAttachmentRequest;
import com.zbkj.common.result.CommonResult;
import com.zbkj.common.utils.CrmebUtil;
import com.zbkj.service.service.SystemAttachmentService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -44,7 +44,7 @@ public class SystemAttachmentController {
@PreAuthorize("hasAuthority('admin:system:attachment:list')")
@ApiOperation(value = "分页列表") //配合swagger使用
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<SystemAttachment>> getList(
public CommonResult<CommonPage<SystemAttachment>> getList(
@RequestParam @Validated Integer pid,
@RequestParam(
value = "attType",

4
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemCityController.java
View File

@@ -3,7 +3,7 @@ package com.zbkj.admin.controller;
import com.zbkj.common.model.system.SystemCity;
import com.zbkj.common.request.SystemCityRequest;
import com.zbkj.common.request.SystemCitySearchRequest;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.result.CommonResult;
import com.zbkj.common.vo.SystemCityTreeVo;
import com.zbkj.service.service.SystemCityService;
import io.swagger.annotations.Api;
@@ -25,7 +25,7 @@ import java.util.List;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

130
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemConfigController.java
View File

@@ -1,9 +1,10 @@
package com.zbkj.admin.controller;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.model.system.SystemConfig;
import com.zbkj.common.request.SystemConfigAdminRequest;
import com.zbkj.common.request.SaveConfigRequest;
import com.zbkj.common.request.SystemFormCheckRequest;
import com.zbkj.common.response.AdminSiteLogoResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.SystemConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -14,7 +15,6 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
/**
@@ -22,7 +22,7 @@ import java.util.List;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -38,87 +38,93 @@ public class SystemConfigController {
@Autowired
private SystemConfigService systemConfigService;
/**
* 查询配置表信息
* @param formId Integer
*/
@PreAuthorize("hasAuthority('admin:system:config:info')")
@ApiOperation(value = "详情")
@ApiOperation(value = "表单详情")
@RequestMapping(value = "/info", method = RequestMethod.GET)
public CommonResult<HashMap<String, String>> info(@RequestParam(value = "formId") Integer formId) {
return CommonResult.success(systemConfigService.info(formId));
}
/**
* 整体保存表单数据
* @param systemFormCheckRequest SystemFormCheckRequest 新增参数
*/
@PreAuthorize("hasAuthority('admin:system:config:save:form')")
@ApiOperation(value = "整体保存表单数据")
@RequestMapping(value = "/save/form", method = RequestMethod.POST)
public CommonResult<String> saveFrom(@RequestBody @Validated SystemFormCheckRequest systemFormCheckRequest) {
if (systemConfigService.saveForm(systemFormCheckRequest)) {
return CommonResult.success();
return CommonResult.success("表单保存成功");
}
return CommonResult.failed();
return CommonResult.failed("表单保存失败");
}
/**
* 检测表单name是否存在
* @param name name
*/
@PreAuthorize("hasAuthority('admin:system:config:check')")
@ApiOperation(value = "检测表单name是否存在")
@RequestMapping(value = "/check", method = RequestMethod.GET)
public CommonResult<Boolean> check(@RequestParam String name) {
return CommonResult.success(systemConfigService.checkName(name));
@PreAuthorize("hasAuthority('admin:system:config:upload:type')")
@ApiOperation(value = "获取文件存储类型")
@RequestMapping(value = "/get/upload/type", method = RequestMethod.GET)
public CommonResult<SystemConfig> getFileUploadType() {
return CommonResult.success(systemConfigService.getFileUploadType());
}
/**
* 配置表中仅仅存储对应的配置
* @param key 配置表中的配置字段
* @param value 对应的值
*/
@PreAuthorize("hasAuthority('admin:system:config:saveuniq')")
@ApiOperation(value = "表单配置中仅仅存储")
@RequestMapping(value = "/saveuniq", method = RequestMethod.POST)
public CommonResult<Boolean> justSaveUniq(@RequestParam String key, @RequestParam String value) {
return CommonResult.success(systemConfigService.updateOrSaveValueByName(key, value));
// @PreAuthorize("hasAuthority('admin:system:config:site:logo')")
@ApiOperation(value = "获取管理端logo")
@RequestMapping(value = "/get/site/logo", method = RequestMethod.GET)
public CommonResult<AdminSiteLogoResponse> getSiteLogo() {
return CommonResult.success(systemConfigService.getSiteLogo());
}
/**
* 根据key获取表单配置数据
* @param key 配置表的的字段
*/
@PreAuthorize("hasAuthority('admin:system:config:getuniq')")
@ApiOperation(value = "表单配置根据key获取")
@RequestMapping(value = "/getuniq", method = RequestMethod.GET)
public CommonResult<Object> justGetUniq(@RequestParam String key) {
return CommonResult.success(systemConfigService.getValueByKey(key),"success");
@PreAuthorize("hasAuthority('admin:system:config:tx:map:key')")
@ApiOperation(value = "获取腾讯地图key")
@RequestMapping(value = "/get/tx/map/key", method = RequestMethod.GET)
public CommonResult<SystemConfig> getTxMapKey() {
return CommonResult.success(systemConfigService.getTxMapKey());
}
/**
* 根据key获取配置
*/
@PreAuthorize("hasAuthority('admin:system:config:get')")
@ApiOperation(value = "根据key获取配置")
@RequestMapping(value = "/get", method = RequestMethod.GET)
public CommonResult<List<SystemConfig>> getByKey(@RequestParam String key) {
return CommonResult.success(systemConfigService.getListByKey(key));
@PreAuthorize("hasAuthority('admin:system:config:home:page:list:style')")
@ApiOperation(value = "获取移动端首页列表样式")
@RequestMapping(value = "/get/home/page/list/style", method = RequestMethod.GET)
public CommonResult<SystemConfig> getHomePageSaleListStyle() {
return CommonResult.success(systemConfigService.getHomePageSaleListStyle());
}
/**
* 更新配置信息
*/
@PreAuthorize("hasAuthority('admin:system:config:update')")
@ApiOperation(value = "更新配置信息")
@RequestMapping(value = "/update", method = RequestMethod.POST)
public CommonResult<List<SystemConfig>> getByKey(@RequestBody @Validated List<SystemConfigAdminRequest> requestList) {
if (systemConfigService.updateByList(requestList)) {
return CommonResult.success();
@PreAuthorize("hasAuthority('admin:system:config:home:page:list:style:save')")
@ApiOperation(value = "保存移动端首页列表样式")
@RequestMapping(value = "/save/home/page/list/style", method = RequestMethod.POST)
public CommonResult<String> saveHomePageSaleListStyle(@RequestBody SaveConfigRequest request) {
if (systemConfigService.saveHomePageSaleListStyle(request)) {
return CommonResult.success("保存成功");
}
return CommonResult.failed();
return CommonResult.failed("保存失败");
}
@PreAuthorize("hasAuthority('admin:system:config:auth:host:get')")
@ApiOperation(value = "获取授权地址")
@RequestMapping(value = "/get/auth/host", method = RequestMethod.GET)
public CommonResult<SystemConfig> getAuthHost() {
return CommonResult.success(systemConfigService.getAuthHost());
}
@PreAuthorize("hasAuthority('admin:system:config:change:color:get')")
@ApiOperation(value = "获取主题色")
@RequestMapping(value = "/get/change/color", method = RequestMethod.GET)
public CommonResult<SystemConfig> getChangeColor() {
return CommonResult.success(systemConfigService.getChangeColor());
}
@PreAuthorize("hasAuthority('admin:system:config:change:color:save')")
@ApiOperation(value = "保存主题色")
@RequestMapping(value = "/save/change/color", method = RequestMethod.POST)
public CommonResult<String> saveChangeColor(@RequestBody SaveConfigRequest request) {
if (systemConfigService.saveChangeColor(request)) {
return CommonResult.success("保存成功");
}
return CommonResult.failed("保存失败");
}
@PreAuthorize("hasAuthority('admin:system:config:clear:cache')")
@ApiOperation(value = "清除config缓存")
@RequestMapping(value = "/clear/cache", method = RequestMethod.POST)
public CommonResult<String> clearCache() {
if (systemConfigService.clearCache()) {
return CommonResult.success("清除成功");
}
return CommonResult.failed("清除失败");
}
}

10
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemFormTempController.java
View File

@@ -1,11 +1,11 @@
package com.zbkj.admin.controller;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.model.system.SystemFormTemp;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.SystemFormTempRequest;
import com.zbkj.common.request.SystemFormTempSearchRequest;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.SystemFormTempService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -45,7 +45,7 @@ public class SystemFormTempController {
@PreAuthorize("hasAuthority('admin:system:form:list')")
@ApiOperation(value = "分页列表")
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<SystemFormTemp>> getList(@Validated SystemFormTempSearchRequest request, @Validated PageParamRequest pageParamRequest) {
public CommonResult<CommonPage<SystemFormTemp>> getList(@Validated SystemFormTempSearchRequest request, @Validated PageParamRequest pageParamRequest) {
CommonPage<SystemFormTemp> systemFormTempCommonPage = CommonPage.restPage(systemFormTempService.getList(request, pageParamRequest));
return CommonResult.success(systemFormTempCommonPage);
}

17
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemGroupController.java
View File

@@ -1,19 +1,22 @@
package com.zbkj.admin.controller;
import com.zbkj.common.model.system.SystemGroup;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.SystemGroupRequest;
import com.zbkj.common.request.SystemGroupSearchRequest;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.SystemGroupService;
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.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import com.zbkj.common.model.system.SystemGroup;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
@@ -21,7 +24,7 @@ import com.zbkj.common.model.system.SystemGroup;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -45,7 +48,7 @@ public class SystemGroupController {
@PreAuthorize("hasAuthority('admin:system:group:list')")
@ApiOperation(value = "分页列表")
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<SystemGroup>> getList(@Validated SystemGroupSearchRequest request, @Validated PageParamRequest pageParamRequest) {
public CommonResult<CommonPage<SystemGroup>> getList(@Validated SystemGroupSearchRequest request, @Validated PageParamRequest pageParamRequest) {
CommonPage<SystemGroup> systemGroupCommonPage = CommonPage.restPage(systemGroupService.getList(request, pageParamRequest));
return CommonResult.success(systemGroupCommonPage);
}

10
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemGroupDataController.java
View File

@@ -1,11 +1,11 @@
package com.zbkj.admin.controller;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.model.system.SystemGroupData;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.SystemGroupDataRequest;
import com.zbkj.common.request.SystemGroupDataSearchRequest;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.SystemGroupDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -45,7 +45,7 @@ public class SystemGroupDataController {
@PreAuthorize("hasAuthority('admin:system:group:data:list')")
@ApiOperation(value = "分页组合数据详情")
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<SystemGroupData>> getList(@Validated SystemGroupDataSearchRequest request, @Validated PageParamRequest pageParamRequest) {
public CommonResult<CommonPage<SystemGroupData>> getList(@Validated SystemGroupDataSearchRequest request, @Validated PageParamRequest pageParamRequest) {
CommonPage<SystemGroupData> systemGroupDataCommonPage = CommonPage.restPage(systemGroupDataService.getList(request, pageParamRequest));
return CommonResult.success(systemGroupDataCommonPage);
}

5
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemMenuController.java
View File

@@ -1,9 +1,10 @@
package com.zbkj.admin.controller;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.model.system.SystemMenu;
import com.zbkj.common.request.SystemMenuRequest;
import com.zbkj.common.request.SystemMenuSearchRequest;
import com.zbkj.common.result.CommonResult;
import com.zbkj.common.vo.MenuCheckVo;
import com.zbkj.service.service.SystemMenuService;
import io.swagger.annotations.Api;
@@ -22,7 +23,7 @@ import java.util.List;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

4
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemNotificationController.java
View File

@@ -4,8 +4,8 @@ import com.zbkj.common.model.system.SystemNotification;
import com.zbkj.common.request.NotificationInfoRequest;
import com.zbkj.common.request.NotificationSearchRequest;
import com.zbkj.common.request.NotificationUpdateRequest;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.response.NotificationInfoResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.SystemNotificationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -22,7 +22,7 @@ import java.util.List;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

4
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemRoleController.java
View File

@@ -5,8 +5,8 @@ import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.SystemRoleRequest;
import com.zbkj.common.request.SystemRoleSearchRequest;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.response.RoleInfoResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.SystemRoleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

14
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemStoreController.java
View File

@@ -1,11 +1,11 @@
package com.zbkj.admin.controller;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.model.system.SystemStore;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.SystemStoreRequest;
import com.zbkj.common.request.SystemStoreSearchRequest;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.SystemStoreService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -23,7 +23,7 @@ import java.util.HashMap;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -47,7 +47,7 @@ public class SystemStoreController {
@PreAuthorize("hasAuthority('admin:system:store:list')")
@ApiOperation(value = "门店自提分页列表")
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<SystemStore>> getList(@Validated SystemStoreSearchRequest request, @Validated PageParamRequest pageParamRequest) {
public CommonResult<CommonPage<SystemStore>> getList(@Validated SystemStoreSearchRequest request, @Validated PageParamRequest pageParamRequest) {
CommonPage<SystemStore> expressCommonPage = CommonPage.restPage(systemStoreService.getList(request.getKeywords(), request.getStatus(), pageParamRequest));
return CommonResult.success(expressCommonPage);
}
@@ -58,8 +58,8 @@ public class SystemStoreController {
@PreAuthorize("hasAuthority('admin:system:store:count')")
@ApiOperation(value = "数量")
@RequestMapping(value = "/getCount", method = RequestMethod.GET)
public CommonResult<HashMap<String, Integer>> getCount() {
return CommonResult.success(systemStoreService.getCount());
public CommonResult<HashMap<String, Integer>> getCount( @RequestParam(value = "keywords", defaultValue = "") String keywords) {
return CommonResult.success(systemStoreService.getCount(keywords));
}
/**

12
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemStoreStaffController.java
View File

@@ -1,11 +1,11 @@
package com.zbkj.admin.controller;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.model.system.SystemStoreStaff;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.SystemStoreStaffRequest;
import com.zbkj.common.response.SystemStoreStaffResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.SystemStoreStaffService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -44,8 +44,8 @@ public class SystemStoreStaffController {
@PreAuthorize("hasAuthority('admin:system:staff:list')")
@ApiOperation(value = "分页列表")
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<SystemStoreStaffResponse>> getList(@RequestParam(name = "storeId", required = false, defaultValue = "0") Integer storeId,
@ModelAttribute PageParamRequest pageParamRequest) {
public CommonResult<CommonPage<SystemStoreStaffResponse>> getList(@RequestParam(name = "storeId", required = false, defaultValue = "0") Integer storeId,
@ModelAttribute PageParamRequest pageParamRequest) {
CommonPage<SystemStoreStaffResponse> systemStoreStaffCommonPage =
CommonPage.restPage(systemStoreStaffService.getList(storeId, pageParamRequest));
return CommonResult.success(systemStoreStaffCommonPage);

5
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemUserLevelController.java
View File

@@ -1,9 +1,10 @@
package com.zbkj.admin.controller;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.model.system.SystemUserLevel;
import com.zbkj.common.request.SystemUserLevelRequest;
import com.zbkj.common.request.SystemUserLevelUpdateShowRequest;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.SystemUserLevelService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -21,7 +22,7 @@ import java.util.List;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

6
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/SystemWriteOffOrderController.java
View File

@@ -2,8 +2,8 @@ package com.zbkj.admin.controller;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.SystemWriteOffOrderSearchRequest;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.response.SystemWriteOffOrderResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.StoreOrderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -45,7 +45,7 @@ public class SystemWriteOffOrderController {
@PreAuthorize("hasAuthority('admin:system:order:list')")
@ApiOperation(value = "分页列表") //配合swagger使用
@RequestMapping(value = "/list", method = RequestMethod.POST)
public CommonResult<SystemWriteOffOrderResponse> getList(
public CommonResult<SystemWriteOffOrderResponse> getList(
@Validated SystemWriteOffOrderSearchRequest request,
@Validated PageParamRequest pageParamRequest) {
return CommonResult.success(storeOrderService.getWriteOffList(request, pageParamRequest));

5
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/TemplateMessageController.java
View File

@@ -1,6 +1,7 @@
package com.zbkj.admin.controller;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.TemplateMessageService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -17,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

6
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UploadController.java
View File

@@ -1,6 +1,7 @@
package com.zbkj.admin.controller;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.result.CommonResult;
import com.zbkj.common.vo.FileResultVo;
import com.zbkj.service.service.UploadService;
import io.swagger.annotations.Api;
@@ -9,7 +10,6 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
@@ -24,7 +24,7 @@ import java.io.IOException;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

6
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserController.java
View File

@@ -1,12 +1,12 @@
package com.zbkj.admin.controller;
import com.zbkj.common.model.user.User;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.*;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.model.user.User;
import com.zbkj.common.response.TopDetail;
import com.zbkj.common.response.UserResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -29,7 +29,7 @@ import java.util.List;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

10
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserExtractController.java
View File

@@ -1,12 +1,12 @@
package com.zbkj.admin.controller;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.model.finance.UserExtract;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.UserExtractRequest;
import com.zbkj.common.request.UserExtractSearchRequest;
import com.zbkj.common.response.BalanceResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.UserExtractService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -49,7 +49,7 @@ public class UserExtractController {
@PreAuthorize("hasAuthority('admin:finance:apply:list')")
@ApiOperation(value = "分页列表")
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<UserExtract>> getList(@Validated UserExtractSearchRequest request, @Validated PageParamRequest pageParamRequest){
public CommonResult<CommonPage<UserExtract>> getList(@Validated UserExtractSearchRequest request, @Validated PageParamRequest pageParamRequest){
CommonPage<UserExtract> userExtractCommonPage = CommonPage.restPage(userExtractService.getList(request, pageParamRequest));
return CommonResult.success(userExtractCommonPage);
}

10
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserGroupController.java
View File

@@ -1,10 +1,10 @@
package com.zbkj.admin.controller;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.model.user.UserGroup;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.UserGroupRequest;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.UserGroupService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -43,7 +43,7 @@ public class UserGroupController {
@PreAuthorize("hasAuthority('admin:user:group:list')")
@ApiOperation(value = "分页列表")
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<UserGroup>> getList(@Validated PageParamRequest pageParamRequest) {
public CommonResult<CommonPage<UserGroup>> getList(@Validated PageParamRequest pageParamRequest) {
CommonPage<UserGroup> userGroupCommonPage = CommonPage.restPage(userGroupService.getList(pageParamRequest));
return CommonResult.success(userGroupCommonPage);
}

6
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserIntegralController.java
View File

@@ -1,10 +1,10 @@
package com.zbkj.admin.controller;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.AdminIntegralSearchRequest;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.response.UserIntegralRecordResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.UserIntegralRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

10
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserLevelController.java
View File

@@ -1,9 +1,9 @@
package com.zbkj.admin.controller;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.model.user.UserLevel;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.UserLevelService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -44,7 +44,7 @@ public class UserLevelController {
@PreAuthorize("hasAuthority('admin:user:level:list')")
@ApiOperation(value = "分页列表")
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<UserLevel>> getList(@Validated PageParamRequest pageParamRequest) {
public CommonResult<CommonPage<UserLevel>> getList(@Validated PageParamRequest pageParamRequest) {
CommonPage<UserLevel> userLevelCommonPage = CommonPage.restPage(userLevelService.getList(pageParamRequest));
return CommonResult.success(userLevelCommonPage);
}

4
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserRechargeController.java
View File

@@ -1,10 +1,10 @@
package com.zbkj.admin.controller;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.UserRechargeSearchRequest;
import com.zbkj.common.response.UserRechargeResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.UserRechargeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -25,7 +25,7 @@ import java.util.HashMap;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

12
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/UserTagController.java
View File

@@ -1,18 +1,18 @@
package com.zbkj.admin.controller;
import com.zbkj.common.model.user.UserTag;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.UserTagRequest;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.UserTagService;
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.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import com.zbkj.common.model.user.UserTag;
/**
@@ -20,7 +20,7 @@ import com.zbkj.common.model.user.UserTag;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -43,7 +43,7 @@ public class UserTagController {
@PreAuthorize("hasAuthority('admin:user:tag:list')")
@ApiOperation(value = "分页列表") //配合swagger使用
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<UserTag>> getList(@Validated PageParamRequest pageParamRequest) {
public CommonResult<CommonPage<UserTag>> getList(@Validated PageParamRequest pageParamRequest) {
CommonPage<UserTag> userTagCommonPage = CommonPage.restPage(userTagService.getList(pageParamRequest));
return CommonResult.success(userTagCommonPage);
}

50
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/ValidateCodeController.java
View File

@@ -1,50 +0,0 @@
package com.zbkj.admin.controller;
import com.zbkj.common.response.CommonResult;
import com.zbkj.admin.service.ValidateCodeService;
import com.zbkj.admin.vo.ValidateCode;
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.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 验证码服务
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
* | Author: CRMEB Team <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Slf4j
@RestController
@RequestMapping("api/admin/validate/code")
@Api(tags = "验证码服务")
public class ValidateCodeController {
@Autowired
private ValidateCodeService validateCodeService;
/**
* 获取图片验证码
* @return CommonResult
*/
// @PreAuthorize("hasAuthority('admin:validate:code:get')")
@ApiOperation(value="获取验证码")
@GetMapping(value = "/get")
public CommonResult<ValidateCode> get() {
ValidateCode validateCode = validateCodeService.get();
return CommonResult.success(validateCode);
}
}

5
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WeChatAdminController.java
View File

@@ -1,7 +1,8 @@
package com.zbkj.admin.controller;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.response.WeChatJsSdkConfigResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.WechatNewService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -19,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

7
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WeChatController.java
View File

@@ -1,7 +1,8 @@
package com.zbkj.admin.controller;
import com.alibaba.fastjson.JSONObject;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.WechatNewService;
import com.zbkj.service.service.WechatPublicService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -18,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -33,6 +34,8 @@ public class WeChatController {
@Autowired
private WechatPublicService wechatPublicService;
@Autowired
private WechatNewService wechatNewService;
/**
* 获取微信菜单

2
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WechatCallbackController.java
View File

@@ -17,7 +17,7 @@ import java.io.PrintWriter;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

3
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WechatMediaController.java
View File

@@ -1,6 +1,7 @@
package com.zbkj.admin.controller;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.WechatMediaService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

10
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/WechatReplyController.java
View File

@@ -1,11 +1,11 @@
package com.zbkj.admin.controller;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.model.wechat.WechatReply;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.WechatReplyRequest;
import com.zbkj.common.request.WechatReplySearchRequest;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.WechatReplyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -46,7 +46,7 @@ public class WechatReplyController {
@PreAuthorize("hasAuthority('admin:wechat:keywords:reply:list')")
@ApiOperation(value = "分页列表")
@RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<CommonPage<WechatReply>> getList(@Validated WechatReplySearchRequest request, @Validated PageParamRequest pageParamRequest) {
public CommonResult<CommonPage<WechatReply>> getList(@Validated WechatReplySearchRequest request, @Validated PageParamRequest pageParamRequest) {
CommonPage<WechatReply> wechatReplyCommonPage = CommonPage.restPage(wechatReplyService.getList(request, pageParamRequest));
return CommonResult.success(wechatReplyCommonPage);
}

10
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/YlyPrintController.java
View File

@@ -1,20 +1,24 @@
package com.zbkj.admin.controller;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.YlyPrintService;
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.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
/**
* 易联云打印订单
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

10
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/JwtAuthenticationTokenFilter.java
View File

@@ -15,17 +15,9 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
* | Author: CRMEB Team <admin@crmeb.com>
* +----------------------------------------------------------------------
* token过滤器 验证token有效性
*/
//@Component
public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
@Resource

26
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/ResponseFilter.java
View File

@@ -1,7 +1,11 @@
package com.zbkj.admin.filter;
import com.zbkj.common.config.CrmebConfig;
import com.zbkj.common.utils.RequestUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.security.web.FilterInvocation;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
@@ -14,7 +18,7 @@ import java.nio.charset.StandardCharsets;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -25,20 +29,32 @@ import java.nio.charset.StandardCharsets;
//@Component
public class ResponseFilter implements Filter {
@Autowired
CrmebConfig crmebConfig;
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain)
public void doFilter(ServletRequest servletRequest, ServletResponse response, FilterChain filterChain)
throws IOException, ServletException {
ResponseWrapper wrapperResponse = new ResponseWrapper((HttpServletResponse) response);//转换成代理类
FilterInvocation fi = new FilterInvocation(servletRequest, wrapperResponse, filterChain);
HttpServletRequest request = (HttpServletRequest) servletRequest;
//OPTIONS请求直接放行
if(request.getMethod().equals(HttpMethod.OPTIONS.toString())){
fi.getChain().doFilter(fi.getRequest(), fi.getResponse());
return;
}
// 这里只拦截返回，直接让请求过去，如果在请求前有处理，可以在这里处理
filterChain.doFilter(request, wrapperResponse);
filterChain.doFilter(servletRequest, wrapperResponse);
byte[] content = wrapperResponse.getContent();//获取返回值
//判断是否有值
if (content.length > 0) {
String str = new String(content, StandardCharsets.UTF_8);
try {
HttpServletRequest req = (HttpServletRequest) request;
str = new ResponseRouter().filter(str, RequestUtil.getUri(req));
HttpServletRequest req = (HttpServletRequest) servletRequest;
str = new ResponseRouter().filter(str, RequestUtil.getUri(req), crmebConfig);
} catch (Exception e) {
e.printStackTrace();
}

40
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/ResponseRouter.java
View File

@@ -1,15 +1,18 @@
package com.zbkj.admin.filter;
import com.zbkj.common.constants.Constants;
import com.zbkj.common.config.CrmebConfig;
import com.zbkj.common.constants.UploadConstants;
import com.zbkj.common.utils.SpringUtil;
import com.zbkj.service.service.SystemAttachmentService;
import org.springframework.util.AntPathMatcher;
import org.springframework.util.PathMatcher;
/**
* response路径处理
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -18,24 +21,35 @@ import com.zbkj.service.service.SystemAttachmentService;
*/
public class ResponseRouter {
public String filter(String data, String path) {
public String filter(String data, String path, CrmebConfig crmebConfig) {
boolean result = un().contains(path);
if (result) {
return data;
}
// if (!path.contains("api/admin/") && !path.contains("api/front/")) {
// return data;
// }
//根据需要处理返回值
if (data.contains(Constants.UPLOAD_TYPE_IMAGE+"/") && !data.contains("data:image/png;base64")) {
data = SpringUtil.getBean(SystemAttachmentService.class).prefixImage(data);
//系统不用过滤的URL，针对数据而非token
PathMatcher pathMatcher = new AntPathMatcher();
for (String configUrl : crmebConfig.getIgnored()) {
if(pathMatcher.match(path, configUrl)){
return data;
}
}
// if (data.contains("file/")) { 附件也走crmebimage 目录下
// data = SpringUtil.getBean(SystemAttachmentService.class).prefixFile(data);
// }
if (!path.contains("api/admin/") && !path.contains("api/front/")) {
return data;
}
//根据需要处理返回值 && !data.contains("data:image/png;base64")
if ((data.contains(UploadConstants.UPLOAD_FILE_KEYWORD + "/"))
|| data.contains(UploadConstants.DOWNLOAD_FILE_KEYWORD) || data.contains(UploadConstants.UPLOAD_AFTER_FILE_KEYWORD)) {
if (data.contains(UploadConstants.DOWNLOAD_FILE_KEYWORD + "/" + UploadConstants.UPLOAD_MODEL_PATH_EXCEL)) {
data = SpringUtil.getBean(SystemAttachmentService.class).prefixFile(data);
} else if (data.contains(UploadConstants.UPLOAD_AFTER_FILE_KEYWORD + "/")) {
data = SpringUtil.getBean(SystemAttachmentService.class).prefixUploadf(data);
} else {
data = SpringUtil.getBean(SystemAttachmentService.class).prefixImage(data);
}
}
return data;
}

7
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/ResponseWrapper.java
View File

@@ -1,19 +1,20 @@
package com.zbkj.admin.filter;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import javax.servlet.ServletOutputStream;
import javax.servlet.WriteListener;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
/**
* Response包装类
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

2
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/filter/TokenComponent.java
View File

@@ -17,7 +17,7 @@ import java.util.concurrent.TimeUnit;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

5
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/manager/AuthenticationEntryPointImpl.java
View File

@@ -1,7 +1,8 @@
package com.zbkj.admin.manager;
import com.alibaba.fastjson.JSONObject;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.result.CommonResult;
import com.zbkj.common.result.CommonResultCode;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.stereotype.Component;
@@ -26,7 +27,7 @@ public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, S
httpServletResponse.setContentType("application/json");
httpServletResponse.setCharacterEncoding("utf-8");
try {
httpServletResponse.getWriter().print(JSONObject.toJSONString(CommonResult.unauthorized()));
httpServletResponse.getWriter().print(JSONObject.toJSONString(CommonResult.failed(CommonResultCode.UNAUTHORIZED)));
} catch (IOException ioException) {
ioException.printStackTrace();
}

6
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/manager/CustomAccessDeniedHandler.java
View File

@@ -1,7 +1,9 @@
package com.zbkj.admin.manager;
import com.alibaba.fastjson.JSONObject;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.result.CommonResult;
import com.zbkj.common.result.CommonResultCode;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.web.access.AccessDeniedHandler;
import org.springframework.stereotype.Component;
@@ -30,7 +32,7 @@ public class CustomAccessDeniedHandler implements AccessDeniedHandler, Serializa
httpServletResponse.setContentType("application/json");
httpServletResponse.setCharacterEncoding("utf-8");
try {
httpServletResponse.getWriter().print(JSONObject.toJSONString(CommonResult.forbidden()));
httpServletResponse.getWriter().print(JSONObject.toJSONString(CommonResult.failed(CommonResultCode.FORBIDDEN)));
} catch (IOException ioException) {
ioException.printStackTrace();
}

13
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/pub/GetJSConfig.java
View File

@@ -1,6 +1,7 @@
package com.zbkj.admin.pub;
import com.zbkj.common.constants.Constants;
import com.zbkj.common.result.CommonResult;
import com.zbkj.service.service.SystemConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -31,4 +32,16 @@ public class GetJSConfig {
public String set(){
return systemConfigService.getValueByKey(Constants.JS_CONFIG_CRMEB_CHAT_TONGJI);
}
@ApiOperation(value = "获取移动端域名")
@RequestMapping(value = "/get/front/domain", method = RequestMethod.GET)
public CommonResult<String> getFrontDomain() {
return CommonResult.success(systemConfigService.getFrontDomain());
}
@ApiOperation(value = "获取平台当前的素材地址")
@RequestMapping(value = "/get/admin/mediadomain", method = RequestMethod.GET)
public CommonResult<String> getMediaDomain() {
return CommonResult.success(systemConfigService.getMediaDomain());
}
}

43
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/pub/ImageMergeController.java
View File

@@ -1,43 +0,0 @@
package com.zbkj.admin.pub;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.utils.ImageMergeUtil;
import com.zbkj.common.vo.ImageMergeUtilVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 图片操作
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
* | Author: CRMEB Team <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Slf4j
@RestController
@RequestMapping("api/public/qrcode")
@Api(tags = "图片操作")
public class ImageMergeController {
@PreAuthorize("hasAuthority('public:qrcode:merge:list')")
@ApiOperation(value = "合并图片返回文件")
@RequestMapping(value = "/mergeList", method = RequestMethod.POST)
public CommonResult<Map<String, String>> mergeList(@RequestBody @Validated List<ImageMergeUtilVo> list){
Map<String, String> map = new HashMap<>();
map.put("base64Code", ImageMergeUtil.drawWordFile(list)); //需要云服务域名，如果需要存入数据库参照上传图片服务
return CommonResult.success(map);
}
}

2
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/pub/WeChatMessageController.java
View File

@@ -21,7 +21,7 @@ import java.io.PrintWriter;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

4
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/pub/WeChatPushController.java
View File

@@ -1,7 +1,7 @@
package com.zbkj.admin.pub;
import com.alibaba.fastjson.JSONObject;
import com.zbkj.common.response.CommonResult;
import com.zbkj.common.result.CommonResult;
import com.zbkj.common.utils.RestTemplateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -21,7 +21,7 @@ import java.util.Map;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

25
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/AdminLoginService.java
View File

@@ -1,5 +1,7 @@
package com.zbkj.admin.service;
import com.zbkj.common.request.LoginAdminUpdatePasswordRequest;
import com.zbkj.common.request.LoginAdminUpdateRequest;
import com.zbkj.common.request.SystemAdminLoginRequest;
import com.zbkj.common.response.MenusResponse;
import com.zbkj.common.response.SystemAdminResponse;
@@ -13,7 +15,7 @@ import java.util.Map;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -48,4 +50,25 @@ public interface AdminLoginService {
* 根据Token获取对应用户信息
*/
SystemAdminResponse getInfoByToken();
/**
* 账号登录检测
* @param account 账号
* @return 账号错误登录次数
*/
Integer accountDetection(String account);
/**
* 修改登录用户信息
*
* @param request 请求参数
* @return Boolean
*/
Boolean loginAdminUpdate(LoginAdminUpdateRequest request);
/**
* 修改登录用户密码
*/
Boolean loginAdminUpdatePwd(LoginAdminUpdatePasswordRequest request);
}

32
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/ValidateCodeService.java
View File

@@ -1,32 +0,0 @@
package com.zbkj.admin.service;
import com.zbkj.admin.vo.ValidateCode;
import java.util.HashMap;
/**
* ValidateCodeService 接口
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
* | Author: CRMEB Team <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
public interface ValidateCodeService {
/**
* 获取图片验证码
* @return CommonResult
*/
ValidateCode get();
/**
* 验证验证码
*/
Boolean check(String key, String code);
}

2
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/WeChatMessageService.java
View File

@@ -7,7 +7,7 @@ import javax.servlet.http.HttpServletRequest;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------

116
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/impl/AdminLoginServiceImpl.java
View File

@@ -1,28 +1,35 @@
package com.zbkj.admin.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.anji.captcha.model.common.ResponseModel;
import com.zbkj.admin.filter.TokenComponent;
import com.zbkj.admin.service.AdminLoginService;
import com.zbkj.admin.service.ValidateCodeService;
import com.zbkj.common.constants.Constants;
import com.zbkj.common.constants.SysConfigConstants;
import com.zbkj.common.constants.SysGroupDataConstants;
import com.zbkj.common.exception.CrmebException;
import com.zbkj.common.model.system.SystemAdmin;
import com.zbkj.common.model.system.SystemMenu;
import com.zbkj.common.model.system.SystemPermissions;
import com.zbkj.common.request.LoginAdminUpdatePasswordRequest;
import com.zbkj.common.request.LoginAdminUpdateRequest;
import com.zbkj.common.request.SystemAdminLoginRequest;
import com.zbkj.common.response.MenusResponse;
import com.zbkj.common.response.SystemAdminResponse;
import com.zbkj.common.response.SystemGroupDataAdminLoginBannerResponse;
import com.zbkj.common.response.SystemLoginResponse;
import com.zbkj.common.result.CommonResultCode;
import com.zbkj.common.utils.CrmebUtil;
import com.zbkj.common.utils.RedisUtil;
import com.zbkj.common.utils.SecurityUtil;
import com.zbkj.common.vo.LoginUserVo;
import com.zbkj.common.vo.MenuTree;
import com.zbkj.service.service.SystemAdminService;
import com.zbkj.service.service.SystemConfigService;
import com.zbkj.service.service.SystemGroupDataService;
import com.zbkj.service.service.SystemMenuService;
import com.zbkj.service.service.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
@@ -44,7 +51,7 @@ import java.util.stream.Stream;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -53,6 +60,7 @@ import java.util.stream.Stream;
*/
@Service
public class AdminLoginServiceImpl implements AdminLoginService {
private final Logger logger = LoggerFactory.getLogger(getClass());
@Resource
private TokenComponent tokenComponent;
@@ -63,9 +71,6 @@ public class AdminLoginServiceImpl implements AdminLoginService {
@Autowired
private SystemAdminService systemAdminService;
@Autowired
private ValidateCodeService validateCodeService;
@Autowired
private SystemConfigService systemConfigService;
@@ -75,24 +80,44 @@ public class AdminLoginServiceImpl implements AdminLoginService {
@Autowired
private SystemMenuService systemMenuService;
@Autowired
private RedisUtil redisUtil;
@Autowired
private SafetyService safetyService;
/**
* PC登录
*/
@Override
public SystemLoginResponse login(SystemAdminLoginRequest systemAdminLoginRequest, String ip) {
// 判断验证码
boolean codeCheckResult = validateCodeService.check(systemAdminLoginRequest.getKey(), systemAdminLoginRequest.getCode());
if (!codeCheckResult) throw new CrmebException("验证码不正确");
Integer errorNum = accountDetection(systemAdminLoginRequest.getAccount());
if (errorNum > 3) {
if (ObjectUtil.isNull(systemAdminLoginRequest.getCaptchaVO())) {
throw new CrmebException("验证码信息不存在");
}
// 校验验证码
ResponseModel responseModel = safetyService.verifySafetyCode(systemAdminLoginRequest.getCaptchaVO());
if (!responseModel.getRepCode().equals("0000")) {
logger.error("验证码登录失败，repCode = {}, repMsg = {}", responseModel.getRepCode(), responseModel.getRepMsg());
accountErrorNumAdd(systemAdminLoginRequest.getAccount());
throw new CrmebException("验证码校验失败");
}
}
// 用户验证
Authentication authentication = null;
// 该方法会去调用UserDetailsServiceImpl.loadUserByUsername
try {
// CusAuthenticationManager authenticationManager = new CusAuthenticationManager(new CustomAuthenticationProvider());
authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(systemAdminLoginRequest.getAccount(), systemAdminLoginRequest.getPwd()));
} catch (AuthenticationException e) {
accountErrorNumAdd(systemAdminLoginRequest.getAccount());
if (e instanceof BadCredentialsException) {
throw new CrmebException("用户不存在或密码错误");
}
throw new CrmebException(e.getMessage());
}catch (CrmebException e){
accountErrorNumAdd(systemAdminLoginRequest.getAccount());
throw new CrmebException("账号或密码不正确");
}
LoginUserVo loginUser = (LoginUserVo) authentication.getPrincipal();
SystemAdmin systemAdmin = loginUser.getUser();
@@ -103,12 +128,15 @@ public class AdminLoginServiceImpl implements AdminLoginService {
BeanUtils.copyProperties(systemAdmin, systemAdminResponse);
//更新最后登录信息
systemAdmin.setUpdateTime(DateUtil.date());
systemAdmin.setLoginCount(systemAdmin.getLoginCount() + 1);
systemAdmin.setLastIp(ip);
systemAdminService.updateById(systemAdmin);
accountErrorNumClear(systemAdminLoginRequest.getAccount());
return systemAdminResponse;
}
/**
* 用户登出
*/
@@ -124,6 +152,7 @@ public class AdminLoginServiceImpl implements AdminLoginService {
/**
* 获取登录页图片
*
* @return Map
*/
@Override
@@ -137,11 +166,14 @@ public class AdminLoginServiceImpl implements AdminLoginService {
//轮播图
List<SystemGroupDataAdminLoginBannerResponse> bannerList = systemGroupDataService.getListByGid(SysGroupDataConstants.GROUP_DATA_ID_ADMIN_LOGIN_BANNER_IMAGE_LIST, SystemGroupDataAdminLoginBannerResponse.class);
map.put("banner", bannerList);
map.put("siteName", systemConfigService.getValueByKey(SysConfigConstants.CONFIG_KEY_SITE_NAME));
return map;
}
/**
* 获取管理员可访问目录
*
* @return List<MenusResponse>
*/
@Override
@@ -184,4 +216,64 @@ public class AdminLoginServiceImpl implements AdminLoginService {
systemAdminResponse.setPermissionsList(permList);
return systemAdminResponse;
}
@Override
public Integer accountDetection(String account) {
SystemAdmin admin = systemAdminService.selectUserByUserName(account);
if (ObjectUtil.isNull(admin)) {
return 0;
}
String key = StrUtil.format(Constants.ADMIN_ACCOUNT_LOGIN_ERROR_NUM_KEY, account);
if (!redisUtil.exists(key)) {
return 0;
}
Integer num = redisUtil.get(key);
return num;
}
/**
* 修改登录用户信息
*
* @param request 请求参数
* @return Boolean
*/
@Override
public Boolean loginAdminUpdate(LoginAdminUpdateRequest request) {
SystemAdmin admin = SecurityUtil.getLoginUserVo().getUser();
SystemAdmin systemAdmin = new SystemAdmin();
systemAdmin.setId(admin.getId());
systemAdmin.setRealName(request.getRealName());
systemAdmin.setUpdateTime(DateUtil.date());
return systemAdminService.updateById(systemAdmin);
}
/**
* 修改登录用户密码
*/
@Override
public Boolean loginAdminUpdatePwd(LoginAdminUpdatePasswordRequest request) {
SystemAdmin admin = SecurityUtil.getLoginUserVo().getUser();
SystemAdmin systemAdmin = systemAdminService.getById(admin.getId());
String encryptPassword = CrmebUtil.encryptPassword(request.getOldPassword(), systemAdmin.getAccount());
if (!systemAdmin.getPwd().equals(encryptPassword)) {
throw new CrmebException(CommonResultCode.VALIDATE_FAILED, "原密码不正确");
}
SystemAdmin newAdmin = new SystemAdmin();
newAdmin.setId(admin.getId());
String pwd = CrmebUtil.encryptPassword(request.getPassword(), admin.getAccount());
newAdmin.setPwd(pwd);
newAdmin.setUpdateTime(DateUtil.date());
return systemAdminService.updateById(newAdmin);
}
private void accountErrorNumAdd(String account) {
redisUtil.incr(StrUtil.format(Constants.ADMIN_ACCOUNT_LOGIN_ERROR_NUM_KEY, account), 1);
}
private void accountErrorNumClear(String account) {
String key = StrUtil.format(Constants.ADMIN_ACCOUNT_LOGIN_ERROR_NUM_KEY, account);
if (redisUtil.exists(key)) {
redisUtil.delete(StrUtil.format(Constants.ADMIN_ACCOUNT_LOGIN_ERROR_NUM_KEY, account));
}
}
}

75
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/impl/ValidateCodeServiceImpl.java
View File

@@ -1,75 +0,0 @@
package com.zbkj.admin.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.zbkj.common.constants.Constants;
import com.zbkj.common.exception.CrmebException;
import com.zbkj.common.utils.CrmebUtil;
import com.zbkj.common.utils.RedisUtil;
import com.zbkj.common.utils.ValidateCodeUtil;
import com.zbkj.admin.service.ValidateCodeService;
import com.zbkj.admin.vo.ValidateCode;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.concurrent.TimeUnit;
/**
* ValidateCodeService 实现类
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
* | Author: CRMEB Team <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Service
public class ValidateCodeServiceImpl implements ValidateCodeService {
@Resource
private RedisUtil redisAdminUtil;
/**
* 获取验证码信息
*/
@Override
public ValidateCode get() {
ValidateCodeUtil.Validate randomCode = ValidateCodeUtil.getRandomCode();//直接调用静态方法，返回验证码对象
if (ObjectUtil.isNull(randomCode)) {
return null;
}
String value = randomCode.getValue().toLowerCase();
String md5Key = DigestUtils.md5Hex(value);
String redisKey = getRedisKey(md5Key);
redisAdminUtil.set(redisKey, value, 5L, TimeUnit.MINUTES); //5分钟过期
String base64Str = randomCode.getBase64Str();
return new ValidateCode(md5Key, CrmebUtil.getBase64Image(base64Str));
}
/**
* 获取redis key
* @param md5Key value的md5加密值
*/
public String getRedisKey(String md5Key) {
return Constants.VALIDATE_REDIS_KEY_PREFIX + md5Key;
}
/**
* 验证
*/
public Boolean check(String key, String code) {
if (!redisAdminUtil.exists(getRedisKey(key))) {
throw new CrmebException("验证码错误");
}
Object redisValue = redisAdminUtil.get(getRedisKey(key));
if (ObjectUtil.isNull(redisValue)) {
return false;
}
return redisValue.equals(code.toLowerCase());
}
}

6
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/service/impl/WeChatMessageServiceImpl.java
View File

@@ -2,7 +2,7 @@ package com.zbkj.admin.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.zbkj.common.constants.WeChatConstants;
import com.zbkj.common.utils.DateUtil;
import com.zbkj.common.utils.CrmebDateUtil;
import com.zbkj.common.utils.RedisUtil;
import com.zbkj.common.utils.XmlUtil;
import com.zbkj.common.model.article.Article;
@@ -29,7 +29,7 @@ import java.util.Map;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
@@ -157,7 +157,7 @@ public class WeChatMessageServiceImpl implements WeChatMessageService {
return "<xml>\n" +
" <ToUserName><![CDATA["+fromUserName+"]]></ToUserName>\n" +
" <FromUserName><![CDATA["+toUserName+"]]></FromUserName>\n" +
" <CreateTime>"+ DateUtil.getNowTime() +"</CreateTime>\n" +
" <CreateTime>"+ CrmebDateUtil.getNowTime() +"</CreateTime>\n" +
" <MsgType><![CDATA[news]]></MsgType>\n" +
" <ArticleCount>1</ArticleCount>\n" +
" <Articles>\n" +

23
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/bargain/BargainStopChangeTask.java
View File

@@ -1,13 +1,10 @@
package com.zbkj.admin.task.bargain;
import com.zbkj.common.utils.DateUtil;
import com.zbkj.common.utils.CrmebDateUtil;
import com.zbkj.service.service.StoreBargainService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
/**
@@ -15,16 +12,14 @@ import org.springframework.stereotype.Component;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
* | Author: CRMEB Team <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Component
@Configuration //读取配置
@EnableScheduling // 2.开启定时任务
@Component("BargainStopChangeTask")
public class BargainStopChangeTask {
//日志
@@ -33,16 +28,18 @@ public class BargainStopChangeTask {
@Autowired
private StoreBargainService storeBargainService;
@Scheduled(cron = "0 0 0 */1 * ?") //5秒钟同步一次数据
public void init(){
logger.info("---BargainStopChangeTask------bargain stop status change task: Execution Time - {}", DateUtil.nowDateTime());
/**
* 每天0点执行
*/
public void bargainStopChange() {
// cron : 0 0 0 */1 * ?
logger.info("---BargainStopChangeTask------bargain stop status change task: Execution Time - {}", CrmebDateUtil.nowDateTime());
try {
storeBargainService.stopAfterChange();
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
logger.error("BargainStopChangeTask" + " | msg : " + e.getMessage());
}
}
}

22
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/brokerage/BrokerageFrozenTask.java
View File

@@ -2,14 +2,11 @@ package com.zbkj.admin.task.brokerage;
import com.zbkj.admin.task.order.OrderReceiptTask;
import com.zbkj.common.utils.DateUtil;
import com.zbkj.common.utils.CrmebDateUtil;
import com.zbkj.service.service.UserBrokerageRecordService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
/**
@@ -17,16 +14,14 @@ import org.springframework.stereotype.Component;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
* | Author: CRMEB Team <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Component
@Configuration //读取配置
@EnableScheduling // 2.开启定时任务
@Component("BrokerageFrozenTask")
public class BrokerageFrozenTask {
//日志
@@ -35,10 +30,12 @@ public class BrokerageFrozenTask {
@Autowired
private UserBrokerageRecordService userBrokerageRecordService;
// @Scheduled(fixedDelay = 1000 * 60 * 60L) //1小时同步一次数据
@Scheduled(fixedDelay = 1000 * 60L) //1分钟同步一次数据
public void init(){
logger.info("---BrokerageFrozenTask task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDateTime());
/**
* 1小时同步一次数据
*/
public void brokerageFrozen() {
// cron : 0 0 */1 * * ?
logger.info("---BrokerageFrozenTask task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime());
try {
userBrokerageRecordService.brokerageThaw();
@@ -46,6 +43,5 @@ public class BrokerageFrozenTask {
e.printStackTrace();
logger.error("BrokerageFrozenTask.task" + " | msg : " + e.getMessage());
}
}
}

21
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/coupon/CouponOverdueTask.java
View File

@@ -1,13 +1,10 @@
package com.zbkj.admin.task.coupon;
import com.zbkj.common.utils.DateUtil;
import com.zbkj.common.utils.CrmebDateUtil;
import com.zbkj.service.service.StoreCouponUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
/**
@@ -15,16 +12,14 @@ import org.springframework.stereotype.Component;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
* | Author: CRMEB Team <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Component
@Configuration //读取配置
@EnableScheduling // 2.开启定时任务
@Component("CouponOverdueTask")
public class CouponOverdueTask {
//日志
@@ -33,16 +28,18 @@ public class CouponOverdueTask {
@Autowired
private StoreCouponUserService couponUserService;
@Scheduled(fixedDelay = 1000 * 60L) //1分钟同步一次数据
public void init(){
logger.info("---CouponOverdueTask task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDateTime());
/**
* 1分钟同步一次数据
*/
public void couponOverdue() {
// cron : 0 */1 * * * ?
logger.info("---CouponOverdueTask task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime());
try {
couponUserService.overdueTask();
} catch (Exception e) {
e.printStackTrace();
logger.error("CouponOverdueTask.task" + " | msg : " + e.getMessage());
}
}
}

22
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/integral/IntegralFrozenTask.java
View File

@@ -1,14 +1,11 @@
package com.zbkj.admin.task.integral;
import com.zbkj.common.utils.DateUtil;
import com.zbkj.common.utils.CrmebDateUtil;
import com.zbkj.service.service.UserIntegralRecordService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
/**
@@ -16,16 +13,14 @@ import org.springframework.stereotype.Component;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
* | Author: CRMEB Team <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Component
@Configuration //读取配置
@EnableScheduling // 2.开启定时任务
@Component("IntegralFrozenTask")
public class IntegralFrozenTask {
//日志
@@ -34,15 +29,18 @@ public class IntegralFrozenTask {
@Autowired
private UserIntegralRecordService userIntegralRecordService;
@Scheduled(fixedDelay = 1000 * 60L) //1分钟同步一次数据
public void init() {
logger.info("---IntegralFrozenTask task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDateTime());
/**
* 1分钟同步一次数据
*/
public void integralFrozen() {
// cron : 0 */1 * * * ?
logger.info("---IntegralFrozenTask task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime());
try {
userIntegralRecordService.integralThaw();
} catch (Exception e) {
e.printStackTrace();
logger.error("IntegralFrozenTask.task" + " | msg : " + e.getMessage());
}
}
}

20
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/log/AutoDeleteLogTask.java
View File

@@ -1,13 +1,11 @@
package com.zbkj.admin.task.log;
import com.zbkj.common.utils.DateUtil;
import com.zbkj.admin.service.ScheduleJobLogService;
import com.zbkj.common.utils.CrmebDateUtil;
import com.zbkj.service.service.WechatExceptionsService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
/**
@@ -15,36 +13,36 @@ import org.springframework.stereotype.Component;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
* | Author: CRMEB Team <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Component
@Configuration //读取配置
@EnableScheduling // 2.开启定时任务
@Component("AutoDeleteLogTask")
public class AutoDeleteLogTask {
//日志
private static final Logger logger = LoggerFactory.getLogger(AutoDeleteLogTask.class);
@Autowired
private ScheduleJobLogService scheduleJobLogService;
@Autowired
private WechatExceptionsService wechatExceptionsService;
/**
* 每天0点执行
*/
@Scheduled(cron = "0 0 0 */1 * ?")
public void autoDeleteLog() {
// cron : 0 0 0 */1 * ?
logger.info("---AutoDeleteLogTask------bargain stop status change task: Execution Time - {}", DateUtil.nowDateTime());
logger.info("---BargainStopChangeTask------bargain stop status change task: Execution Time - {}", CrmebDateUtil.nowDateTime());
try {
scheduleJobLogService.autoDeleteLog();
wechatExceptionsService.autoDeleteLog();
} catch (Exception e) {
e.printStackTrace();
logger.error("AutoDeleteLogTask" + " | msg : " + e.getMessage());
logger.error("BargainStopChangeTask" + " | msg : " + e.getMessage());
}
}

21
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderAutoCancelTask.java
View File

@@ -1,13 +1,10 @@
package com.zbkj.admin.task.order;
import com.zbkj.common.utils.DateUtil;
import com.zbkj.common.utils.CrmebDateUtil;
import com.zbkj.service.service.OrderTaskService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
/**
@@ -15,16 +12,14 @@ import org.springframework.stereotype.Component;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
* | Author: CRMEB Team <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Component
@Configuration //读取配置
@EnableScheduling // 2.开启定时任务
@Component("OrderAutoCancelTask")
public class OrderAutoCancelTask {
//日志
private static final Logger logger = LoggerFactory.getLogger(OrderAutoCancelTask.class);
@@ -32,9 +27,12 @@ public class OrderAutoCancelTask {
@Autowired
private OrderTaskService orderTaskService;
@Scheduled(fixedDelay = 1000 * 60L) //1分钟同步一次数据
public void init() {
logger.info("---OrderAutoCancelTask task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDateTime());
/**
* 1分钟同步一次数据
*/
public void autoCancel() {
// cron : 0 */1 * * * ?
logger.info("---OrderAutoCancelTask task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime());
try {
orderTaskService.autoCancel();
@@ -42,6 +40,5 @@ public class OrderAutoCancelTask {
e.printStackTrace();
logger.error("OrderAutoCancelTask.task" + " | msg : " + e.getMessage());
}
}
}

21
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderAutoCompleteTask.java
View File

@@ -1,13 +1,10 @@
package com.zbkj.admin.task.order;
import com.zbkj.common.utils.DateUtil;
import com.zbkj.common.utils.CrmebDateUtil;
import com.zbkj.service.service.OrderTaskService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
/**
@@ -15,16 +12,14 @@ import org.springframework.stereotype.Component;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
* | Author: CRMEB Team <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Component
@Configuration //读取配置
@EnableScheduling // 2.开启定时任务
@Component("OrderAutoCompleteTask")
public class OrderAutoCompleteTask {
//日志
@@ -33,16 +28,18 @@ public class OrderAutoCompleteTask {
@Autowired
private OrderTaskService orderTaskService;
@Scheduled(fixedDelay = 1000 * 60L * 60) //每小时同步一次数据
public void init() {
logger.info("---OrderAutoCompleteTask task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDateTime());
/**
* 每小时同步一次数据
*/
public void autoComplete() {
// cron : 0 0 */1 * * ?
logger.info("---OrderAutoCompleteTask task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime());
try {
orderTaskService.autoComplete();
} catch (Exception e) {
e.printStackTrace();
logger.error("OrderAutoCompleteTask.task" + " | msg : " + e.getMessage());
}
}
}

21
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderCancelTask.java
View File

@@ -1,13 +1,10 @@
package com.zbkj.admin.task.order;
import com.zbkj.common.utils.DateUtil;
import com.zbkj.common.utils.CrmebDateUtil;
import com.zbkj.service.service.OrderTaskService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
/**
@@ -15,16 +12,14 @@ import org.springframework.stereotype.Component;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
* | Author: CRMEB Team <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Component
@Configuration //读取配置
@EnableScheduling // 2.开启定时任务
@Component("OrderCancelTask")
public class OrderCancelTask {
//日志
private static final Logger logger = LoggerFactory.getLogger(OrderCancelTask.class);
@@ -32,9 +27,12 @@ public class OrderCancelTask {
@Autowired
private OrderTaskService orderTaskService;
@Scheduled(fixedDelay = 1000 * 60L) //1分钟同步一次数据
public void init() {
logger.info("---OrderCancelTask task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDateTime());
/**
* 1分钟同步一次数据
*/
public void userCancel() {
// cron : 0 */1 * * * ?
logger.info("---OrderCancelTask task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime());
try {
orderTaskService.cancelByUser();
@@ -42,6 +40,5 @@ public class OrderCancelTask {
e.printStackTrace();
logger.error("OrderCancelTask.task" + " | msg : " + e.getMessage());
}
}
}

21
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderCompleteTask.java
View File

@@ -1,13 +1,10 @@
package com.zbkj.admin.task.order;
import com.zbkj.common.utils.DateUtil;
import com.zbkj.common.utils.CrmebDateUtil;
import com.zbkj.service.service.OrderTaskService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
/**
@@ -15,16 +12,14 @@ import org.springframework.stereotype.Component;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
* | Author: CRMEB Team <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Component
@Configuration //读取配置
@EnableScheduling // 2.开启定时任务
@Component("OrderCompleteTask")
public class OrderCompleteTask {
//日志
private static final Logger logger = LoggerFactory.getLogger(OrderCompleteTask.class);
@@ -32,9 +27,12 @@ public class OrderCompleteTask {
@Autowired
private OrderTaskService orderTaskService;
@Scheduled(fixedDelay = 1000 * 60L) //1分钟同步一次数据
public void init() {
logger.info("---OrderCompleteTask task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDateTime());
/**
* 1分钟同步一次数据
*/
public void orderComplete() {
// cron : 0 */1 * * * ?
logger.info("---OrderCompleteTask task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime());
try {
orderTaskService.complete();
@@ -42,6 +40,5 @@ public class OrderCompleteTask {
e.printStackTrace();
logger.error("OrderCompleteTask.task" + " | msg : " + e.getMessage());
}
}
}

21
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderPaySuccessTask.java
View File

@@ -1,13 +1,10 @@
package com.zbkj.admin.task.order;
import com.zbkj.common.utils.DateUtil;
import com.zbkj.common.utils.CrmebDateUtil;
import com.zbkj.service.service.OrderTaskService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
/**
@@ -15,16 +12,14 @@ import org.springframework.stereotype.Component;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
* | Author: CRMEB Team <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Component
@Configuration //读取配置
@EnableScheduling // 2.开启定时任务
@Component("OrderPaySuccessTask")
public class OrderPaySuccessTask {
//日志
@@ -33,16 +28,18 @@ public class OrderPaySuccessTask {
@Autowired
private OrderTaskService orderTaskService;
@Scheduled(fixedDelay = 1000 * 60L) //1分钟同步一次数据
public void init() {
logger.info("---OrderPaySuccessTask task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDateTime());
/**
* 1分钟同步一次数据
*/
public void orderPayAfter() {
// cron : 0 */1 * * * ?
logger.info("---OrderPaySuccessTask task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime());
try {
orderTaskService.orderPaySuccessAfter();
} catch (Exception e) {
e.printStackTrace();
logger.error("OrderPaySuccessTask.task" + " | msg : " + e.getMessage());
}
}
}

22
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderReceiptTask.java
View File

@@ -1,29 +1,24 @@
package com.zbkj.admin.task.order;
import com.zbkj.common.utils.DateUtil;
import com.zbkj.common.utils.CrmebDateUtil;
import com.zbkj.service.service.OrderTaskService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
/** 用户确认收货Task
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
* | Author: CRMEB Team <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Component
@Configuration //读取配置
@EnableScheduling // 2.开启定时任务
@Component("OrderReceiptTask")
public class OrderReceiptTask {
//日志
private static final Logger logger = LoggerFactory.getLogger(OrderReceiptTask.class);
@@ -31,9 +26,12 @@ public class OrderReceiptTask {
@Autowired
private OrderTaskService orderTaskService;
@Scheduled(fixedDelay = 1000 * 60L) //1分钟同步一次数据
public void init() {
logger.info("---OrderReceiptTask task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDateTime());
/**
* 1分钟同步一次数据
*/
public void orderReceipt() {
//cron : 0 */1 * * * ?
logger.info("---OrderReceiptTask task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime());
try {
orderTaskService.orderReceiving();
@@ -41,6 +39,6 @@ public class OrderReceiptTask {
e.printStackTrace();
logger.error("OrderReceiptTask.task" + " | msg : " + e.getMessage());
}
}
}

25
crmeb/crmeb-admin/src/main/java/com/zbkj/admin/task/order/OrderRefundTask.java
View File

@@ -1,12 +1,10 @@
package com.zbkj.admin.task.order;
import com.zbkj.common.utils.DateUtil;
import com.zbkj.common.utils.CrmebDateUtil;
import com.zbkj.service.service.OrderTaskService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -15,16 +13,14 @@ import org.springframework.stereotype.Component;
* +----------------------------------------------------------------------
* | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
* +----------------------------------------------------------------------
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
* | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
* +----------------------------------------------------------------------
* | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
* +----------------------------------------------------------------------
* | Author: CRMEB Team <admin@crmeb.com>
* +----------------------------------------------------------------------
*/
@Component
@Configuration //读取配置
@EnableScheduling // 2.开启定时任务
@Component("OrderRefundTask")
public class OrderRefundTask {
//日志
private static final Logger logger = LoggerFactory.getLogger(OrderRefundTask.class);
@@ -32,9 +28,12 @@ public class OrderRefundTask {
@Autowired
private OrderTaskService orderTaskService;
@Scheduled(fixedDelay = 1000 * 60L) //1分钟同步一次数据
public void init(){
logger.info("---OrderRefundTask task------produce Data with fixed rate task: Execution Time - {}", DateUtil.nowDateTime());
/**
* 1分钟同步一次数据
*/
public void orderRefund() {
// cron : 0 */1 * * * ?
logger.info("---OrderRefundTask task------produce Data with fixed rate task: Execution Time - {}", CrmebDateUtil.nowDateTime());
try {
orderTaskService.refundApply();
@@ -42,6 +41,12 @@ public class OrderRefundTask {
e.printStackTrace();
logger.error("OrderRefundTask.task" + " | msg : " + e.getMessage());
}
}
@Scheduled(fixedDelay = 1000 * 60L) //
public void init(){
}
}

Some files were not shown because too many files have changed in this diff Show More