diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..0d46b1d5 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,34 @@ +{ + "configurations": [ + { + "type": "java", + "name": "Spring Boot-CrmebAdminApplication", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "com.zbkj.admin.CrmebAdminApplication", + "projectName": "crmeb-admin", + "args": "", + "envFile": "${workspaceFolder}/.env" + }, + { + "type": "java", + "name": "Spring Boot-YlyUtil", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "com.zbkj.service.util.YlyUtil", + "projectName": "crmeb-service", + "args": "", + "envFile": "${workspaceFolder}/.env" + }, + { + "type": "java", + "name": "Spring Boot-CrmebFrontApplication", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "com.zbkj.front.CrmebFrontApplication", + "projectName": "crmeb-front", + "args": "", + "envFile": "${workspaceFolder}/.env" + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..dcafc047 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive", + "java.debug.settings.onBuildFailureProceed": true, + "java.compile.nullAnalysis.mode": "automatic" +} \ No newline at end of file diff --git a/admin/.env.development b/admin/.env.development index 90b992d4..924e9685 100644 --- a/admin/.env.development +++ b/admin/.env.development @@ -4,7 +4,7 @@ ENV = 'development' # base api # VUE_APP_BASE_API = '/dev-api' # VUE_APP_BASE_API = 'https://api.java.crmeb.net' -VUE_APP_BASE_API = 'http://192.168.31.35:2500' +VUE_APP_BASE_API = 'http://127.0.0.1:8080' # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # to control whether the babel-plugin-dynamic-import-node plugin is enabled. diff --git a/app/config/app.js b/app/config/app.js index b5ffd309..ca64bece 100644 --- a/app/config/app.js +++ b/app/config/app.js @@ -8,7 +8,7 @@ // | Author: CRMEB Team // +---------------------------------------------------------------------- //移动端商城API -let domain = 'http://192.168.31.35:2511' +let domain = 'http://127.0.0.1:8081' // let domain = 'https://apif.java.crmeb.net' module.exports = { @@ -17,7 +17,7 @@ module.exports = { // HTTP_REQUEST_URL:'', HTTP_REQUEST_URL: domain, // H5商城地址 - HTTP_H5_URL: 'http://java.crmeb.net', + HTTP_H5_URL: domain, // #endif // #ifdef H5 HTTP_REQUEST_URL:domain, diff --git a/app/package-lock.json b/app/package-lock.json index bda726cf..ef84a6d2 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,5 +1,5 @@ { - "name": "single_uniapp", + "name": "app", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/CrmebAdminApplication.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/CrmebAdminApplication.java index 969f00d2..b5eb23d8 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/CrmebAdminApplication.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/CrmebAdminApplication.java @@ -26,13 +26,23 @@ @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"}) +@SpringBootApplication( + exclude = DataSourceAutoConfiguration.class + , scanBasePackages={ + "com.zbkj.common.*", + "com.zbkj.common.utils.*" + } +) //去掉数据源 +@ComponentScan({ + "com.utils", + "com.zbkj.crmeb", + "com.exception", + "com.common", + "com.aop", + "com.zbkj.common", + "com.zbkj.common.utils" +}) //扫描utils包和父包 +@MapperScan(basePackages = {"com.zbkj.crmeb.*.dao", "com.zbkj.crmeb.*.*.dao"}) @ComponentScan(basePackages = {"com.zbkj"}) @MapperScan(basePackages = {"com.zbkj.**.dao"}) public class CrmebAdminApplication { diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/quartz/ScheduleManager.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/quartz/ScheduleManager.java index 19cb9185..cf4fc184 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/quartz/ScheduleManager.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/quartz/ScheduleManager.java @@ -50,14 +50,19 @@ public CronTrigger getCronTrigger(ScheduleJob scheduleJob) { public void createScheduleJob(ScheduleJob scheduleJob) { try { //构建job信息 - JobDetail jobDetail = JobBuilder.newJob(QuartzJob.class).withIdentity(getJobKey(scheduleJob)).build(); + JobDetail jobDetail = JobBuilder.newJob(QuartzJob.class).withIdentity( + getJobKey(scheduleJob) + ).build(); //表达式调度构建器，可以根据scheduleJob修改withMisfireHandling方法，但是使用异步执行定时任务，没必要 - CronScheduleBuilder scheduleBuilder = CronScheduleBuilder.cronSchedule(scheduleJob.getCronExpression()) - .withMisfireHandlingInstructionFireAndProceed(); + CronScheduleBuilder scheduleBuilder = CronScheduleBuilder.cronSchedule( + scheduleJob.getCronExpression() + ).withMisfireHandlingInstructionFireAndProceed(); //按新的cronExpression表达式构建一个新的trigger - CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity(getTriggerKey(scheduleJob)).withSchedule(scheduleBuilder).build(); + CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity( + getTriggerKey(scheduleJob) + ).withSchedule(scheduleBuilder).build(); //放入参数，运行时的方法可以获取 jobDetail.getJobDataMap().put(QuartzJob.JOB_PARAM_KEY, scheduleJob); diff --git a/crmeb/crmeb-admin/src/main/resources/application-dev.yml b/crmeb/crmeb-admin/src/main/resources/application-dev.yml index 64bfb3ef..54054a36 100644 --- a/crmeb/crmeb-admin/src/main/resources/application-dev.yml +++ b/crmeb/crmeb-admin/src/main/resources/application-dev.yml @@ -12,7 +12,7 @@ crmeb: demoSite: true # 是否演示站点 所有手机号码都会掩码 server: - port: 20500 + port: 8080 spring: profiles: @@ -26,13 +26,13 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/single_open?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 - username: single_open - password: 111111 + url: jdbc:mysql://192.168.33.10:3306/crmeb?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 + username: root + password: 123456 redis: - host: 127.0.0.1 #地址 + host: 192.168.33.10 #地址 port: 6379 #端口 - password: 111111 + password: 123456 timeout: 10000 # 连接超时时间（毫秒） database: 6 #默认数据库 jedis: diff --git a/crmeb/crmeb-admin/src/main/resources/application.yml b/crmeb/crmeb-admin/src/main/resources/application.yml index df2e2ae4..e3859d29 100644 --- a/crmeb/crmeb-admin/src/main/resources/application.yml +++ b/crmeb/crmeb-admin/src/main/resources/application.yml @@ -39,7 +39,7 @@ spring: profiles: # 配置的环境 # active: #spring.profiles.active# - active: + active: dev servlet: multipart: max-file-size: 50MB #设置单个文件大小 @@ -54,39 +54,44 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/single_open?serverTimezone=UTC - username: single_open - password: 111111 + url: jdbc:mysql://192.168.33.10:3306/crmeb?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 + username: root + password: 123456 # quartz quartz: - properties: - org: - quartz: - scheduler: - instanceName: quartzScheduler - # instanceName: clusteredScheduler - instanceId: AUTO - jobStore: - class: org.quartz.impl.jdbcjobstore.JobStoreTX - driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate - tablePrefix: QRTZ_ - isClustered: false - clusterCheckinInterval: 10000 - useProperties: false - # dataSource: crmeb_java_beta - threadPool: - class: org.quartz.simpl.SimpleThreadPool - threadCount: 10 - threadPriority: 5 - threadsInheritContextClassLoaderOfInitializingThread: true - #数据库方式 - job-store-type: JDBC + enable: false + auto-startup: false + startup-delay: 1000000 + + # quartz: + # properties: + # org: + # quartz: + # scheduler: + # instanceName: quartzScheduler + # # instanceName: clusteredScheduler + # instanceId: AUTO + # jobStore: + # class: org.quartz.impl.jdbcjobstore.JobStoreTX + # driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate + # tablePrefix: QRTZ_ + # isClustered: false + # clusterCheckinInterval: 10000 + # useProperties: false + # # dataSource: crmeb_java_beta + # threadPool: + # class: org.quartz.simpl.SimpleThreadPool + # threadCount: 10 + # threadPriority: 5 + # threadsInheritContextClassLoaderOfInitializingThread: true + # #数据库方式 + # job-store-type: JDBC redis: - host: 127.0.0.1 #地址 + host: 192.168.33.10 #地址 port: 6379 #端口 - password: 111111 + password: 123456 timeout: 30000 # 连接超时时间（毫秒） database: 6 #默认数据库 jedis: diff --git a/crmeb/crmeb-common/pom.xml b/crmeb/crmeb-common/pom.xml index bb1eef62..b82d8681 100644 --- a/crmeb/crmeb-common/pom.xml +++ b/crmeb/crmeb-common/pom.xml @@ -317,8 +317,46 @@ spring-boot-starter-captcha 1.3.0 - + + + org.projectlombok + lombok + 1.18.38 + + + commons-codec + commons-codec + 1.14 + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + 1.8 + 1.8 + UTF-8 + + -parameters + + + + + + + org.projectlombok + lombok + 1.18.38 + + + + + + + diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/interceptor/SwaggerInterceptor.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/interceptor/SwaggerInterceptor.java index fcf152f6..eeb993bd 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/interceptor/SwaggerInterceptor.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/interceptor/SwaggerInterceptor.java @@ -6,7 +6,8 @@ import org.springframework.util.AntPathMatcher; import org.springframework.util.FileCopyUtils; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; -import sun.misc.BASE64Decoder; +// import sun.misc.BASE64Decoder; +import org.apache.commons.codec.binary.Base64; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -52,7 +53,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons public boolean httpBasicAuth(String authorization) throws IOException { if(check){ if (authorization != null && authorization.split(" ").length == 2) { - String userAndPass = new String(new BASE64Decoder().decodeBuffer(authorization.split(" ")[1])); + String userAndPass = new String(Base64.decodeBase64(authorization.split(" ")[1])); String username = userAndPass.split(":").length == 2 ? userAndPass.split(":")[0] : null; String password = userAndPass.split(":").length == 2 ? userAndPass.split(":")[1] : null; return this.username.equals(username) && this.password.equals(password); diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java index d7b2129b..ffe544a9 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java @@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject; import com.zbkj.common.constants.Constants; import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletRequest; import java.io.UnsupportedEncodingException; @@ -31,6 +32,7 @@ * | Author: CRMEB Team * +---------------------------------------------------------------------- */ +@Component public class CrmebUtil { public static String encryptPassword(String pwd, String key) { diff --git a/crmeb/crmeb-front/src/main/resources/application-dev.yml b/crmeb/crmeb-front/src/main/resources/application-dev.yml index 81c5afa2..d5f0d273 100644 --- a/crmeb/crmeb-front/src/main/resources/application-dev.yml +++ b/crmeb/crmeb-front/src/main/resources/application-dev.yml @@ -5,7 +5,7 @@ crmeb: asyncConfig: false #是否同步config表数据到redis server: - port: 20510 + port: 8081 spring: profiles: @@ -15,13 +15,13 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/single_open?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 - username: single_open - password: 111111 + url: jdbc:mysql://192.168.33.10:3306/crmeb?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 + username: root + password: 123456 redis: - host: 127.0.0.1 #地址 + host: 192.168.33.10 #地址 port: 6379 #端口 - password: 111111 + password: 123456 timeout: 10000 # 连接超时时间（毫秒） database: 6 #默认数据库 jedis: diff --git a/crmeb/crmeb-front/src/main/resources/application.yml b/crmeb/crmeb-front/src/main/resources/application.yml index c5f4d356..5af6c6b7 100644 --- a/crmeb/crmeb-front/src/main/resources/application.yml +++ b/crmeb/crmeb-front/src/main/resources/application.yml @@ -33,7 +33,7 @@ spring: profiles: # 配置的环境 # active: #spring.profiles.active# - active: + active: dev servlet: multipart: max-file-size: 50MB #设置单个文件大小 @@ -48,13 +48,13 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/single_open?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 - username: single_open - password: 111111 + url: jdbc:mysql://192.168.33.10:3306/crmeb?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 + username: root + password: 123456 redis: - host: 127.0.0.1 #地址 - port: 6379 #端口 - password: 111111 + host: 192.168.33.10 + port: 6379 + password: 123456 timeout: 30000 # 连接超时时间（毫秒） database: 6 #默认数据库 jedis: diff --git a/crmeb/pom.xml b/crmeb/pom.xml index 21f741f2..18e244d0 100644 --- a/crmeb/pom.xml +++ b/crmeb/pom.xml @@ -308,7 +308,11 @@ jwks-rsa 0.9.0 - + + org.projectlombok + lombok + 1.18.38 + @@ -328,6 +332,13 @@ + + + org.projectlombok + lombok + 1.18.38 + +