zxh 3 years ago
parent
commit
2f99d37f9f
31 changed files with 119 additions and 40 deletions
  1. 1
      .idea/compiler.xml
  2. 1
      .idea/modules.xml
  3. BIN
      jbs-core/target/jbs-core-1.0.jar
  4. 7
      jbs-micros/jbs-micros-api/src/main/java/com/jbs/modules/sce/pojo/dto/SceInfoDto.java
  5. BIN
      jbs-micros/jbs-micros-api/target/jbs-micros-api-1.0.jar
  6. BIN
      jbs-micros/jbs-micros-service/target/jbs-micros-service-1.0.jar
  7. BIN
      jbs-micros/jbs-micros-service/target/jbs-micros-service-1.0.jar.original
  8. 2
      jbs-web/src/main/java/com/jbs/framework/config/SecurityConfig.java
  9. 87
      jbs-web/src/main/java/com/jbs/modules/sys/web/TestController.java
  10. BIN
      jbs-web/target/classes/com/jbs/framework/config/SecurityConfig.class
  11. BIN
      jbs-web/target/jbs-web-1.0.jar
  12. BIN
      jbs-web/target/jbs-web-1.0.jar.original
  13. 1
      jbs-web/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  14. 1
      jbs-web/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  15. 4
      jbs-wx-dm-web/src/main/java/com/jbs/modules/sce/web/SceInfoController.java
  16. 3
      jbs-wx-dm-web/src/main/java/com/jbs/modules/sce/web/SceResourceController.java
  17. 4
      jbs-wx-dm-web/src/main/resources/application-dev.yml
  18. 4
      jbs-wx-dm-web/src/main/resources/application-local.yml
  19. 4
      jbs-wx-dm-web/src/main/resources/application-online.yml
  20. 4
      jbs-wx-user-web/src/main/java/com/jbs/modules/sce/web/SceInfoController.java
  21. 3
      jbs-wx-user-web/src/main/java/com/jbs/modules/sce/web/SceResourceController.java
  22. 4
      jbs-wx-user-web/src/main/resources/application-dev.yml
  23. 4
      jbs-wx-user-web/src/main/resources/application-local.yml
  24. 4
      jbs-wx-user-web/src/main/resources/application-online.yml
  25. BIN
      log/jbs-micros/spring.log.2021-09-22.0.gz
  26. BIN
      log/jbs-micros/spring.log.2021-09-23.0.gz
  27. BIN
      log/jbs-web/spring.log.2021-09-22.0.gz
  28. BIN
      log/jbs-wx-dm-web/spring.log.2021-09-22.0.gz
  29. BIN
      log/jbs-wx-dm-web/spring.log.2021-09-23.0.gz
  30. BIN
      log/jbs-wx-user-web/spring.log.2021-09-22.0.gz
  31. 21
      zlkc.iml

1
.idea/compiler.xml

@ -16,6 +16,7 @@
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
<module name="jbs" target="1.8" />
<module name="jbs-core" target="1.8" />
<module name="jbs-micros" target="1.8" />
<module name="jbs-micros-api" target="1.8" />

1
.idea/modules.xml

@ -2,6 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/jbs.iml" filepath="$PROJECT_DIR$/jbs.iml" />
<module fileurl="file://$PROJECT_DIR$/jbs-core/jbs-core.iml" filepath="$PROJECT_DIR$/jbs-core/jbs-core.iml" />
<module fileurl="file://$PROJECT_DIR$/jbs-micros/jbs-micros.iml" filepath="$PROJECT_DIR$/jbs-micros/jbs-micros.iml" />
<module fileurl="file://$PROJECT_DIR$/jbs-micros/jbs-micros-api/jbs-micros-api.iml" filepath="$PROJECT_DIR$/jbs-micros/jbs-micros-api/jbs-micros-api.iml" />

BIN
jbs-core/target/jbs-core-1.0.jar

7
jbs-micros/jbs-micros-api/src/main/java/com/jbs/modules/sce/pojo/dto/SceInfoDto.java

@ -4,6 +4,7 @@ import com.jbs.base.pojo.BaseDto;
import com.jbs.modules.sce.pojo.entity.SceProcess;
import com.jbs.modules.sce.pojo.entity.SceResource;
import java.util.ArrayList;
import java.util.List;
/**
@ -121,6 +122,9 @@ public class SceInfoDto extends BaseDto<Long>{
}
public List<SceProcess> getProcessesList() {
if(null == processesList){
return new ArrayList<>();
}
return processesList;
}
@ -129,6 +133,9 @@ public class SceInfoDto extends BaseDto<Long>{
}
public List<SceResourceDto> getResourcesList() {
if(null == resourcesList){
return new ArrayList<>();
}
return resourcesList;
}

BIN
jbs-micros/jbs-micros-api/target/jbs-micros-api-1.0.jar

BIN
jbs-micros/jbs-micros-service/target/jbs-micros-service-1.0.jar

BIN
jbs-micros/jbs-micros-service/target/jbs-micros-service-1.0.jar.original

2
jbs-web/src/main/java/com/jbs/framework/config/SecurityConfig.java

@ -101,7 +101,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
.antMatchers("/webjars/**").anonymous()
.antMatchers("/druid/**").anonymous()
// zafk
.antMatchers("/ylcshtzhycsjbxx/**").anonymous()
.antMatchers("/test").anonymous()
// 除上面外的所有请求全部需要鉴权认证
.anyRequest().permitAll()
// .anyRequest().authenticated()

87
jbs-web/src/main/java/com/jbs/modules/sys/web/TestController.java

@ -0,0 +1,87 @@
package com.jbs.modules.sys.web;
import com.jbs.common.utils.DateUtils;
import com.jbs.common.utils.IdGen;
import com.jbs.common.utils.IdUtils;
import com.jbs.framework.utils.SecurityUtils;
import com.jbs.modules.sce.pojo.dto.SceInfoDto;
import com.jbs.modules.sce.pojo.dto.SceProcessDto;
import com.jbs.modules.sce.service.SceInfoService;
import com.jbs.modules.sce.service.SceProcessService;
import com.jbs.modules.sys.pojo.entity.SysUser;
import com.jbs.modules.sys.service.SysUserService;
import com.jbs.modules.tips.pojo.dto.TipsInfoDto;
import com.jbs.modules.tips.service.TipsInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
@RestController
@RequestMapping("test")
public class TestController {
@Autowired
private SysUserService userService;
@Autowired
private SceInfoService sceInfoService;
@Autowired
private SceProcessService sceProcessService;
@Autowired
private TipsInfoService tipsInfoService;
@PostMapping("")
public void test() {
for(int i = 1; i <= 10000; i++){
//用户
SysUser user = new SysUser();
user.setNickName("昵称"+IdGen.randomInt6Digit());
user.setUserName("18295"+IdGen.randomInt6Digit());
//随机生成密码
String password = String.valueOf(IdGen.randomInt6Digit());
user.setPassword(SecurityUtils.encryptPassword(password));
user.setPhonenumber("18295"+IdGen.randomInt6Digit());
user.setUserId(IdUtils.getSnowId());
user.setCreateTime(new Date());
user.setUserType("01");
user.setLevel(0);
user.setDisLevel(0);
user.setIfCertification(0);
user.setBalanceValue(0.00);
userService.insertUser(user);
//剧本
SceInfoDto sceInfoDto = new SceInfoDto();
sceInfoDto.preInsert();
sceInfoDto.setCode(DateUtils.dateTime()+ IdGen.randomInt6Digit());
sceInfoDto.setTitle("标题"+IdGen.randomInt6Digit());
sceInfoDto.setStudioName("工作室"+IdGen.randomInt6Digit());
sceInfoDto.setLabelName("标签"+IdGen.randomInt6Digit());
sceInfoDto.setIntroduction("<p>简介"+IdGen.randomInt6Digit()+"</p>");
sceInfoDto.setState(1);
sceInfoService.insertSelectiveByDto(sceInfoDto);
//流程
SceProcessDto sceProcessDto = new SceProcessDto();
sceProcessDto.preInsert();
sceProcessDto.setTitle("开场");
sceProcessDto.setScenarioId(sceInfoDto.getId());
sceProcessDto.setCode(DateUtils.dateTime()+ IdGen.randomInt6Digit());
sceProcessDto.setType(1);
sceProcessDto.setIntroduction("简介"+IdGen.randomInt6Digit());
sceProcessDto.setSort(1);
sceProcessService.insertSelectiveByDto(sceProcessDto);
//tops
TipsInfoDto tipsInfoDto = new TipsInfoDto();
tipsInfoDto.preInsert();
tipsInfoDto.setScenarioId(sceInfoDto.getId());
tipsInfoDto.setProcessId(sceProcessDto.getId());
tipsInfoDto.setContent("内容"+IdGen.randomInt6Digit());
tipsInfoDto.setSort(1);
tipsInfoDto.setLikeCount(0);
tipsInfoService.insertSelectiveByDto(tipsInfoDto);
System.out.println(i+"---------------成功");
}
}
}

BIN
jbs-web/target/classes/com/jbs/framework/config/SecurityConfig.class

BIN
jbs-web/target/jbs-web-1.0.jar

BIN
jbs-web/target/jbs-web-1.0.jar.original

1
jbs-web/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@ -73,5 +73,6 @@ com\jbs\modules\tips\web\TipsInfoController.class
com\jbs\framework\filter\XssHttpServletRequestWrapper.class
com\jbs\framework\filter\XssHttpServletRequestWrapper$1.class
com\jbs\framework\security\filter\JwtAuthenticationTokenFilter.class
com\jbs\modules\sys\web\TestController.class
com\jbs\framework\properties\SmsProperties.class
com\jbs\modules\common\CommonController.class

1
jbs-web/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@ -54,6 +54,7 @@ F:\word_1\jbs\jbs-web\src\main\java\com\jbs\modules\monitor\SysOperlogController
F:\word_1\jbs\jbs-web\src\main\java\com\jbs\modules\sys\web\SysLoginController.java
F:\word_1\jbs\jbs-web\src\main\java\com\jbs\modules\dm\web\DmLikeRecordController.java
F:\word_1\jbs\jbs-web\src\main\java\com\jbs\framework\security\service\SysLoginService.java
F:\word_1\jbs\jbs-web\src\main\java\com\jbs\modules\sys\web\TestController.java
F:\word_1\jbs\jbs-web\src\main\java\com\jbs\modules\monitor\CacheController.java
F:\word_1\jbs\jbs-web\src\main\java\com\jbs\framework\security\service\TokenService.java
F:\word_1\jbs\jbs-web\src\main\java\com\jbs\modules\sys\web\SysAreaController.java

4
jbs-wx-dm-web/src/main/java/com/jbs/modules/sce/web/SceInfoController.java

@ -118,8 +118,8 @@ public class SceInfoController {
List<SceProcess> sceProcessList = sceProcessService.findList(sceProcess);
List<SceResourceDto> sceResourceList = sceResourceService.findDtoList(sceResource);
sceResourceList = sceResourceList.stream().filter(SceResourceDto -> SceResourceDto.getProcessId() == null || SceResourceDto.getProcessId().equals("")).collect(Collectors.toList());
dto.setProcessesList(sceProcessList);
dto.setResourcesList(sceResourceList);
exist.setProcessesList(sceProcessList);
exist.setResourcesList(sceResourceList);
return HttpResult.success(exist);
}

3
jbs-wx-dm-web/src/main/java/com/jbs/modules/sce/web/SceResourceController.java

@ -148,6 +148,7 @@ public class SceResourceController {
}
sceResourceDtoList = sceResourceService.findDtoListByDto(dto);
SceProcess sceProcess = new SceProcess();
sceProcess.setScenarioId(dto.getScenarioId());
sceProcess.setCode(dto.getProcessId());
SceProcessDto sceProcessDto = sceProcessService.findDtoByEntity(sceProcess);
if(null != sceProcessDto){
@ -157,7 +158,7 @@ public class SceResourceController {
tipsInfoDto = tipsInfoService.findDtoList(tipsInfo);
}
map.put("sceResourceDtoList",sceResourceDtoList);
map.put("tipsInfoDto",tipsInfoDto);
map.put("tipsInfoDtoList",tipsInfoDto);
return HttpResult.success(map);
}

4
jbs-wx-dm-web/src/main/resources/application-dev.yml

@ -93,7 +93,7 @@ wx:
mch-id: 1613879728
mch-key: YinHeCang20210920TanAnGuan123456
key-path: classpath:/cert/apiclient_cert.p12
notify-url: https://www.wxapi.qishichuangke.cn/wxPay/payCallBack
notify-url: https://dm.wxapi.jubensha.life:50002/wxPay/payCallBack
official-account:
appid: wxa9eb44cbba631f4a
secret: bf2d5be35d003722f37343051c0b1131
@ -105,5 +105,5 @@ ent:
mch-key: YinHeCang20210920TanAnGuan123456
key-path: classpath:/cert/ent/apiclient_cert.p12
wxcallbackpre: https://www.wxdev.qishichuangke.cn
wxcallbackpre: https://dm.wxapi.jubensha.life:50002

4
jbs-wx-dm-web/src/main/resources/application-local.yml

@ -97,7 +97,7 @@ wx:
mch-id: 1613879728
mch-key: YinHeCang20210920TanAnGuan123456
key-path: classpath:/cert/apiclient_cert.p12
notify-url: https://www.wxapi.qishichuangke.cn/wxPay/payCallBack
notify-url: https://dm.wxapi.jubensha.life:50002/wxPay/payCallBack
official-account:
appid: wxa9eb44cbba631f4a
secret: bf2d5be35d003722f37343051c0b1131
@ -109,4 +109,4 @@ ent:
mch-key: YinHeCang20210920TanAnGuan123456
key-path: classpath:/cert/ent/apiclient_cert.p12
wxcallbackpre: https://www.wxdev.qishichuangke.cn
wxcallbackpre: https://dm.wxapi.jubensha.life:50002

4
jbs-wx-dm-web/src/main/resources/application-online.yml

@ -93,7 +93,7 @@ wx:
mch-id: 1613879728
mch-key: YinHeCang20210920TanAnGuan123456
key-path: classpath:/cert/apiclient_cert.p12
notify-url: https://www.wxapi.qishichuangke.cn/wxPay/payCallBack
notify-url: https://dm.wxapi.jubensha.life:50002/wxPay/payCallBack
official-account:
appid: wxa9eb44cbba631f4a
secret: bf2d5be35d003722f37343051c0b1131
@ -105,4 +105,4 @@ ent:
mch-key: YinHeCang20210920TanAnGuan123456
key-path: classpath:/cert/ent/apiclient_cert.p12
wxcallbackpre: https://www.wxdev.qishichuangke.cn
wxcallbackpre: https://dm.wxapi.jubensha.life:50002

4
jbs-wx-user-web/src/main/java/com/jbs/modules/sce/web/SceInfoController.java

@ -118,8 +118,8 @@ public class SceInfoController {
List<SceProcess> sceProcessList = sceProcessService.findList(sceProcess);
List<SceResourceDto> sceResourceList = sceResourceService.findDtoList(sceResource);
sceResourceList = sceResourceList.stream().filter(SceResourceDto -> SceResourceDto.getProcessId() == null || SceResourceDto.getProcessId().equals("")).collect(Collectors.toList());
dto.setProcessesList(sceProcessList);
dto.setResourcesList(sceResourceList);
exist.setProcessesList(sceProcessList);
exist.setResourcesList(sceResourceList);
return HttpResult.success(exist);
}

3
jbs-wx-user-web/src/main/java/com/jbs/modules/sce/web/SceResourceController.java

@ -148,6 +148,7 @@ public class SceResourceController {
}
sceResourceDtoList = sceResourceService.findDtoListByDto(dto);
SceProcess sceProcess = new SceProcess();
sceProcess.setScenarioId(dto.getScenarioId());
sceProcess.setCode(dto.getProcessId());
SceProcessDto sceProcessDto = sceProcessService.findDtoByEntity(sceProcess);
if(null != sceProcessDto){
@ -157,7 +158,7 @@ public class SceResourceController {
tipsInfoDto = tipsInfoService.findDtoList(tipsInfo);
}
map.put("sceResourceDtoList",sceResourceDtoList);
map.put("tipsInfoDto",tipsInfoDto);
map.put("tipsInfoDtoList",tipsInfoDto);
return HttpResult.success(map);
}

4
jbs-wx-user-web/src/main/resources/application-dev.yml

@ -93,7 +93,7 @@ wx:
mch-id: 1613879728
mch-key: YinHeCang20210920TanAnGuan123456
key-path: classpath:/cert/apiclient_cert.p12
notify-url: https://www.wxapi.qishichuangke.cn/wxPay/payCallBack
notify-url: https://user.wxapi.jubensha.life:50001/wxPay/payCallBack
official-account:
appid: wxa9eb44cbba631f4a
secret: bf2d5be35d003722f37343051c0b1131
@ -105,5 +105,5 @@ ent:
mch-key: YinHeCang20210920TanAnGuan123456
key-path: classpath:/cert/ent/apiclient_cert.p12
wxcallbackpre: https://www.wxdev.qishichuangke.cn
wxcallbackpre: https://user.wxapi.jubensha.life:50001

4
jbs-wx-user-web/src/main/resources/application-local.yml

@ -97,7 +97,7 @@ wx:
mch-id: 1613879728
mch-key: YinHeCang20210920TanAnGuan123456
key-path: classpath:/cert/apiclient_cert.p12
notify-url: https://www.wxapi.qishichuangke.cn/wxPay/payCallBack
notify-url: https://user.wxapi.jubensha.life:50001/wxPay/payCallBack
official-account:
appid: wxa9eb44cbba631f4a
secret: bf2d5be35d003722f37343051c0b1131
@ -109,4 +109,4 @@ ent:
mch-key: YinHeCang20210920TanAnGuan123456
key-path: classpath:/cert/ent/apiclient_cert.p12
wxcallbackpre: https://www.wxdev.qishichuangke.cn
wxcallbackpre: https://user.wxapi.jubensha.life:50001

4
jbs-wx-user-web/src/main/resources/application-online.yml

@ -93,7 +93,7 @@ wx:
mch-id: 1613879728
mch-key: YinHeCang20210920TanAnGuan123456
key-path: classpath:/cert/apiclient_cert.p12
notify-url: https://www.wxapi.qishichuangke.cn/wxPay/payCallBack
notify-url: https://user.wxapi.jubensha.life:50001/wxPay/payCallBack
official-account:
appid: wxa9eb44cbba631f4a
secret: bf2d5be35d003722f37343051c0b1131
@ -105,4 +105,4 @@ ent:
mch-key: YinHeCang20210920TanAnGuan123456
key-path: classpath:/cert/ent/apiclient_cert.p12
wxcallbackpre: https://www.wxdev.qishichuangke.cn
wxcallbackpre: https://user.wxapi.jubensha.life:50001

BIN
log/jbs-micros/spring.log.2021-09-22.0.gz

BIN
log/jbs-micros/spring.log.2021-09-23.0.gz

BIN
log/jbs-web/spring.log.2021-09-22.0.gz

BIN
log/jbs-wx-dm-web/spring.log.2021-09-22.0.gz

BIN
log/jbs-wx-dm-web/spring.log.2021-09-23.0.gz

BIN
log/jbs-wx-user-web/spring.log.2021-09-22.0.gz

21
zlkc.iml

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-devtools:2.1.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.8.RELEASE" level="project" />
</component>
</module>
Loading…
Cancel
Save