diff --git a/README.md b/README.md index 2537082..30e281d 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,8 @@ ``` ├─vboot-application ->业务应用层，在此写您具体业务代码 ├─vboot-core ->框架核心层 -├─vboot-extend-bi ->BI（报表与数据抽取），以单独一个模块方式维护 +├─vboot-extend ->框架扩展层，包含通用的标准模块 +├─vboot-web ->框架启动层，包含项目配置 注：建议将自己的业务代码写在【vboot-application】层里面，可随框架升级减少冲突。 ``` diff --git a/pom.xml b/pom.xml index b621cb3..e01926e 100644 --- a/pom.xml +++ b/pom.xml @@ -10,8 +10,9 @@ 0.1 vboot-core + vboot-extend vboot-application - vboot-extend-bi + vboot-web diff --git a/vboot-application/pom.xml b/vboot-application/pom.xml index 8df1c65..980bbec 100644 --- a/vboot-application/pom.xml +++ b/vboot-application/pom.xml @@ -14,53 +14,9 @@ com.zsvg - vboot-extend-bi + vboot-extend ${vboot.version} - - - mysql - mysql-connector-java - 5.1.49 - - - - - org.jsoup - jsoup - 1.14.3 - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - true - - - - - - - - repackage - - - - - - - \ No newline at end of file diff --git a/vboot-application/src/main/java/com/abc/module/oa/doc/cate/OaDocCate.java b/vboot-application/src/main/java/vboot/app/module/oa/doc/cate/OaDocCate.java similarity index 83% rename from vboot-application/src/main/java/com/abc/module/oa/doc/cate/OaDocCate.java rename to vboot-application/src/main/java/vboot/app/module/oa/doc/cate/OaDocCate.java index 5075e47..fd784c1 100644 --- a/vboot-application/src/main/java/com/abc/module/oa/doc/cate/OaDocCate.java +++ b/vboot-application/src/main/java/vboot/app/module/oa/doc/cate/OaDocCate.java @@ -1,6 +1,6 @@ -package com.abc.module.oa.doc.cate; +package vboot.app.module.oa.doc.cate; -import vboot.common.mvc.entity.BaseCateEntity; +import vboot.core.common.entity.BaseCateEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/oa/doc/cate/OaDocCateApi.java b/vboot-application/src/main/java/vboot/app/module/oa/doc/cate/OaDocCateApi.java similarity index 89% rename from vboot-application/src/main/java/com/abc/module/oa/doc/cate/OaDocCateApi.java rename to vboot-application/src/main/java/vboot/app/module/oa/doc/cate/OaDocCateApi.java index 8a29386..26299b5 100644 --- a/vboot-application/src/main/java/com/abc/module/oa/doc/cate/OaDocCateApi.java +++ b/vboot-application/src/main/java/vboot/app/module/oa/doc/cate/OaDocCateApi.java @@ -1,8 +1,8 @@ -package com.abc.module.oa.doc.cate; +package vboot.app.module.oa.doc.cate; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.pojo.Ztree; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; +import vboot.core.common.pojo.Ztree; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/oa/doc/cate/OaDocCateRepo.java b/vboot-application/src/main/java/vboot/app/module/oa/doc/cate/OaDocCateRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/oa/doc/cate/OaDocCateRepo.java rename to vboot-application/src/main/java/vboot/app/module/oa/doc/cate/OaDocCateRepo.java index 4b5c884..4527386 100644 --- a/vboot-application/src/main/java/com/abc/module/oa/doc/cate/OaDocCateRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/oa/doc/cate/OaDocCateRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.oa.doc.cate; +package vboot.app.module.oa.doc.cate; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/oa/doc/cate/OaDocCateService.java b/vboot-application/src/main/java/vboot/app/module/oa/doc/cate/OaDocCateService.java similarity index 93% rename from vboot-application/src/main/java/com/abc/module/oa/doc/cate/OaDocCateService.java rename to vboot-application/src/main/java/vboot/app/module/oa/doc/cate/OaDocCateService.java index 40d6fd6..9a9124b 100644 --- a/vboot-application/src/main/java/com/abc/module/oa/doc/cate/OaDocCateService.java +++ b/vboot-application/src/main/java/vboot/app/module/oa/doc/cate/OaDocCateService.java @@ -1,7 +1,7 @@ -package com.abc.module.oa.doc.cate; +package vboot.app.module.oa.doc.cate; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.service.BaseCateService; +import vboot.core.common.dao.Sqler; +import vboot.core.common.service.BaseCateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/oa/doc/main/OaDocMain.java b/vboot-application/src/main/java/vboot/app/module/oa/doc/main/OaDocMain.java similarity index 67% rename from vboot-application/src/main/java/com/abc/module/oa/doc/main/OaDocMain.java rename to vboot-application/src/main/java/vboot/app/module/oa/doc/main/OaDocMain.java index 536ad44..e833b3e 100644 --- a/vboot-application/src/main/java/com/abc/module/oa/doc/main/OaDocMain.java +++ b/vboot-application/src/main/java/vboot/app/module/oa/doc/main/OaDocMain.java @@ -1,6 +1,6 @@ -package com.abc.module.oa.doc.main; +package vboot.app.module.oa.doc.main; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/oa/doc/main/OaDocMainApi.java b/vboot-application/src/main/java/vboot/app/module/oa/doc/main/OaDocMainApi.java similarity index 90% rename from vboot-application/src/main/java/com/abc/module/oa/doc/main/OaDocMainApi.java rename to vboot-application/src/main/java/vboot/app/module/oa/doc/main/OaDocMainApi.java index 1a3e652..eb3533b 100644 --- a/vboot-application/src/main/java/com/abc/module/oa/doc/main/OaDocMainApi.java +++ b/vboot-application/src/main/java/vboot/app/module/oa/doc/main/OaDocMainApi.java @@ -1,7 +1,7 @@ -package com.abc.module.oa.doc.main; +package vboot.app.module.oa.doc.main; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.dom4j.DocumentException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/oa/doc/main/OaDocMainRepo.java b/vboot-application/src/main/java/vboot/app/module/oa/doc/main/OaDocMainRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/oa/doc/main/OaDocMainRepo.java rename to vboot-application/src/main/java/vboot/app/module/oa/doc/main/OaDocMainRepo.java index 975812b..8d29c9b 100644 --- a/vboot-application/src/main/java/com/abc/module/oa/doc/main/OaDocMainRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/oa/doc/main/OaDocMainRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.oa.doc.main; +package vboot.app.module.oa.doc.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/oa/doc/main/OaDocMainService.java b/vboot-application/src/main/java/vboot/app/module/oa/doc/main/OaDocMainService.java similarity index 82% rename from vboot-application/src/main/java/com/abc/module/oa/doc/main/OaDocMainService.java rename to vboot-application/src/main/java/vboot/app/module/oa/doc/main/OaDocMainService.java index 4f65f0a..7b440eb 100644 --- a/vboot-application/src/main/java/com/abc/module/oa/doc/main/OaDocMainService.java +++ b/vboot-application/src/main/java/vboot/app/module/oa/doc/main/OaDocMainService.java @@ -1,7 +1,7 @@ -package com.abc.module.oa.doc.main; +package vboot.app.module.oa.doc.main; -import vboot.common.mvc.service.BaseMainService; -import vboot.module.bpm.proc.main.BpmProcMainService; +import vboot.core.common.service.BaseMainService; +import vboot.core.module.bpm.proc.main.BpmProcMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/sa/agent/main/SaAgentMain.java b/vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMain.java similarity index 76% rename from vboot-application/src/main/java/com/abc/module/sa/agent/main/SaAgentMain.java rename to vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMain.java index d5edea8..ae1d88b 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/agent/main/SaAgentMain.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMain.java @@ -1,11 +1,10 @@ -package com.abc.module.sa.agent.main; +package vboot.app.module.sa.agent.main; -import com.abc.module.te.feat.param.TeFeatParamOption; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import vboot.common.mvc.entity.BaseMainEntity; -import vboot.module.sys.org.root.SysOrg; +import vboot.core.common.entity.BaseMainEntity; +import vboot.core.module.sys.org.root.SysOrg; import javax.persistence.*; import java.util.List; diff --git a/vboot-application/src/main/java/com/abc/module/sa/agent/main/SaAgentMainApi.java b/vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMainApi.java similarity index 57% rename from vboot-application/src/main/java/com/abc/module/sa/agent/main/SaAgentMainApi.java rename to vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMainApi.java index d6fdc4e..b2ef5d1 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/agent/main/SaAgentMainApi.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMainApi.java @@ -1,16 +1,33 @@ -package com.abc.module.sa.agent.main; +package vboot.app.module.sa.agent.main; +import cn.hutool.script.ScriptRuntimeException; +import cn.hutool.script.ScriptUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; +import vboot.core.xutil.lang.XnumberUtil; + +import javax.script.CompiledScript; +import javax.script.ScriptException; +import java.util.Map; @RestController @RequestMapping("sa/agent/main") public class SaAgentMainApi { @GetMapping - public RestResult get(String name,String catid) { + public RestResult get(String name, String catid) { + + CompiledScript script = ScriptUtil.compile("var map={};var a=1;var b=2;map.xx=" + + XnumberUtil.getRandom6() +"+a+b;map"); + try { + Map map= (Map) script.eval(); + System.out.println(map.get("xx")); + } catch (ScriptException e) { + throw new ScriptRuntimeException(e); + } + Sqler sqler = new Sqler("sa_agent_main"); sqler.addLike("t.name", name); sqler.addSelect("t.addre"); diff --git a/vboot-application/src/main/java/com/abc/module/sa/agent/main/SaAgentMainRepo.java b/vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMainRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/sa/agent/main/SaAgentMainRepo.java rename to vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMainRepo.java index 370bd5c..46980ff 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/agent/main/SaAgentMainRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMainRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.sa.agent.main; +package vboot.app.module.sa.agent.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/sa/agent/main/SaAgentMainService.java b/vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMainService.java similarity index 81% rename from vboot-application/src/main/java/com/abc/module/sa/agent/main/SaAgentMainService.java rename to vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMainService.java index c1eeb8b..d8fa6c3 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/agent/main/SaAgentMainService.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMainService.java @@ -1,8 +1,8 @@ -package com.abc.module.sa.agent.main; +package vboot.app.module.sa.agent.main; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.service.BaseMainService; import javax.annotation.PostConstruct; diff --git a/vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMain.java b/vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMain.java new file mode 100644 index 0000000..11e0699 --- /dev/null +++ b/vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMain.java @@ -0,0 +1,18 @@ +package vboot.app.module.sa.cust.main; + +import lombok.Getter; +import lombok.Setter; +import vboot.core.common.entity.BaseMainEntity; + +import javax.persistence.Entity; + +@Entity +@Getter +@Setter +public class SaCustMain extends BaseMainEntity { + + //备注 + private String notes; + + +} \ No newline at end of file diff --git a/vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMainApi.java b/vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMainApi.java new file mode 100644 index 0000000..b220b18 --- /dev/null +++ b/vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMainApi.java @@ -0,0 +1,61 @@ +package vboot.app.module.sa.cust.main; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; + +@RestController +@RequestMapping("sa/cust/main") +public class SaCustMainApi { + + //分页查询项目清单 + @GetMapping + public RestResult get(String name) { + Sqler sqler = new Sqler("sa_cust_main"); + sqler.addLike("t.name", name); + sqler.addSelect("t.notes"); + return RestResult.ok(jdbcDao.findPageData(sqler)); + } + + //查询单个项目 + @GetMapping("one/{id}") + public RestResult getOne(@PathVariable String id) { + SaCustMain main = service.findOne(id); + return RestResult.ok(main); + } + + //新增项目 + @PostMapping + public RestResult post(@RequestBody SaCustMain main) { + return RestResult.ok(service.insert(main)); + } + + //修改项目 + @PutMapping + public RestResult put(@RequestBody SaCustMain main) { + return RestResult.ok(service.update(main)); + } + + //删除项目 + @DeleteMapping("{ids}") + public RestResult delete(@PathVariable String[] ids) { + return RestResult.ok(service.delete(ids)); + } + + + //同时使用JPA与mybatis-plus的事务测试 + @PostMapping("test") + public RestResult postTest() { + service.test(); + return RestResult.ok(); + } + + @Autowired + private SaCustMainService service; + + @Autowired + private JdbcDao jdbcDao; + +} diff --git a/vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMainMapper.java b/vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMainMapper.java new file mode 100644 index 0000000..41e6361 --- /dev/null +++ b/vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMainMapper.java @@ -0,0 +1,10 @@ +package vboot.app.module.sa.cust.main; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SaCustMainMapper extends BaseMapper +{ + +} \ No newline at end of file diff --git a/vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMainService.java b/vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMainService.java new file mode 100644 index 0000000..9177191 --- /dev/null +++ b/vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMainService.java @@ -0,0 +1,64 @@ +package vboot.app.module.sa.cust.main; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import vboot.app.module.sa.agent.main.SaAgentMain; +import vboot.app.module.sa.agent.main.SaAgentMainRepo; +import vboot.core.xutil.lang.XstringUtil; + +import javax.annotation.Resource; + + +@Service +@Transactional(rollbackFor = Exception.class) +public class SaCustMainService { + + public SaCustMain findOne(String id) { + + return custMapper.selectById(id); + } + + public String insert(SaCustMain cust) { + cust.setId(XstringUtil.getUUID()); + custMapper.insert(cust); + return cust.getId(); + } + + public String update(SaCustMain cust) { + custMapper.updateById(cust); + return cust.getId(); + } + + public int delete(String[] ids) { + for (String id : ids) { + custMapper.deleteById(id); + } + return ids.length; + } + + public void test() { + //先通过JPA新增一个代理商 + SaAgentMain agentMain=new SaAgentMain(); + agentMain.setId(XstringUtil.getUUID()); + agentMain.setName("有事务的项目"); + agentRepo.save(agentMain); + + //再通过mybatis-plus新增一个项目，并让它报错 + SaCustMain sdCustMain=new SaCustMain(); + sdCustMain.setId(XstringUtil.getUUID()+"XXXXXXXXXXXXXXXX");//超出长度保存出错 + sdCustMain.setNotes("有事务的客户"); + custMapper.insert(sdCustMain); + } + + @Resource + private SaAgentMainRepo agentRepo; + + @Resource + private SaCustMainMapper custMapper; + + + + + +} + diff --git a/vboot-application/src/main/java/com/abc/module/sa/draw/main/SaDrawMain.java b/vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMain.java similarity index 81% rename from vboot-application/src/main/java/com/abc/module/sa/draw/main/SaDrawMain.java rename to vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMain.java index 2d73065..bcca3b0 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/draw/main/SaDrawMain.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMain.java @@ -1,6 +1,6 @@ -package com.abc.module.sa.draw.main; +package vboot.app.module.sa.draw.main; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/sa/draw/main/SaDrawMainApi.java b/vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMainApi.java similarity index 90% rename from vboot-application/src/main/java/com/abc/module/sa/draw/main/SaDrawMainApi.java rename to vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMainApi.java index 543e43c..90ba911 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/draw/main/SaDrawMainApi.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMainApi.java @@ -1,7 +1,7 @@ -package com.abc.module.sa.draw.main; +package vboot.app.module.sa.draw.main; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/sa/draw/main/SaDrawMainRepo.java b/vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMainRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/sa/draw/main/SaDrawMainRepo.java rename to vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMainRepo.java index a3b1132..bbab69c 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/draw/main/SaDrawMainRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMainRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.sa.draw.main; +package vboot.app.module.sa.draw.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/sa/draw/main/SaDrawMainService.java b/vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMainService.java similarity index 82% rename from vboot-application/src/main/java/com/abc/module/sa/draw/main/SaDrawMainService.java rename to vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMainService.java index 43a5ab5..5a0a3a7 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/draw/main/SaDrawMainService.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMainService.java @@ -1,6 +1,6 @@ -package com.abc.module.sa.draw.main; +package vboot.app.module.sa.draw.main; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/sa/prod/feat/SaProdFeat.java b/vboot-application/src/main/java/vboot/app/module/sa/prod/feat/SaProdFeat.java similarity index 93% rename from vboot-application/src/main/java/com/abc/module/sa/prod/feat/SaProdFeat.java rename to vboot-application/src/main/java/vboot/app/module/sa/prod/feat/SaProdFeat.java index ab51be6..46ea9be 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/prod/feat/SaProdFeat.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/prod/feat/SaProdFeat.java @@ -1,4 +1,4 @@ -package com.abc.module.sa.prod.feat; +package vboot.app.module.sa.prod.feat; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/sa/prod/group/SaProdGroup.java b/vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroup.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/sa/prod/group/SaProdGroup.java rename to vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroup.java index 0881a10..4291448 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/prod/group/SaProdGroup.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroup.java @@ -1,7 +1,7 @@ -package com.abc.module.sa.prod.group; +package vboot.app.module.sa.prod.group; -import com.abc.module.sa.prod.main.SaProdMain; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.app.module.sa.prod.main.SaProdMain; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/sa/prod/group/SaProdGroupApi.java b/vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroupApi.java similarity index 92% rename from vboot-application/src/main/java/com/abc/module/sa/prod/group/SaProdGroupApi.java rename to vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroupApi.java index 137f09b..c24f009 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/prod/group/SaProdGroupApi.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroupApi.java @@ -1,7 +1,7 @@ -package com.abc.module.sa.prod.group; +package vboot.app.module.sa.prod.group; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/sa/prod/group/SaProdGroupRepo.java b/vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroupRepo.java similarity index 84% rename from vboot-application/src/main/java/com/abc/module/sa/prod/group/SaProdGroupRepo.java rename to vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroupRepo.java index fddcdbc..b49b7f7 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/prod/group/SaProdGroupRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroupRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.sa.prod.group; +package vboot.app.module.sa.prod.group; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/sa/prod/group/SaProdGroupService.java b/vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroupService.java similarity index 85% rename from vboot-application/src/main/java/com/abc/module/sa/prod/group/SaProdGroupService.java rename to vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroupService.java index ca220b8..d73f7c0 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/prod/group/SaProdGroupService.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroupService.java @@ -1,6 +1,6 @@ -package com.abc.module.sa.prod.group; +package vboot.app.module.sa.prod.group; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/sa/prod/main/SaProdMain.java b/vboot-application/src/main/java/vboot/app/module/sa/prod/main/SaProdMain.java similarity index 93% rename from vboot-application/src/main/java/com/abc/module/sa/prod/main/SaProdMain.java rename to vboot-application/src/main/java/vboot/app/module/sa/prod/main/SaProdMain.java index 8ab2485..9cbe6c4 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/prod/main/SaProdMain.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/prod/main/SaProdMain.java @@ -1,4 +1,4 @@ -package com.abc.module.sa.prod.main; +package vboot.app.module.sa.prod.main; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/sa/prod/tem/SaProdTem.java b/vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTem.java similarity index 77% rename from vboot-application/src/main/java/com/abc/module/sa/prod/tem/SaProdTem.java rename to vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTem.java index c87717d..3c09501 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/prod/tem/SaProdTem.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTem.java @@ -1,6 +1,6 @@ -package com.abc.module.sa.prod.tem; +package vboot.app.module.sa.prod.tem; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/sa/prod/tem/SaProdTemApi.java b/vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTemApi.java similarity index 90% rename from vboot-application/src/main/java/com/abc/module/sa/prod/tem/SaProdTemApi.java rename to vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTemApi.java index f8566c3..49def0c 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/prod/tem/SaProdTemApi.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTemApi.java @@ -1,7 +1,7 @@ -package com.abc.module.sa.prod.tem; +package vboot.app.module.sa.prod.tem; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/sa/prod/tem/SaProdTemRepo.java b/vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTemRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/sa/prod/tem/SaProdTemRepo.java rename to vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTemRepo.java index cdaf158..2a94c9f 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/prod/tem/SaProdTemRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTemRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.sa.prod.tem; +package vboot.app.module.sa.prod.tem; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/sa/prod/tem/SaProdTemService.java b/vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTemService.java similarity index 82% rename from vboot-application/src/main/java/com/abc/module/sa/prod/tem/SaProdTemService.java rename to vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTemService.java index 5ea1fce..74517c0 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/prod/tem/SaProdTemService.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTemService.java @@ -1,6 +1,6 @@ -package com.abc.module.sa.prod.tem; +package vboot.app.module.sa.prod.tem; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/sa/proj/main/SaProjMain.java b/vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMain.java similarity index 75% rename from vboot-application/src/main/java/com/abc/module/sa/proj/main/SaProjMain.java rename to vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMain.java index 54aeb1b..b9cc6d6 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/proj/main/SaProjMain.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMain.java @@ -1,7 +1,7 @@ -package com.abc.module.sa.proj.main; +package vboot.app.module.sa.proj.main; -import com.abc.module.sa.prod.group.SaProdGroup; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.app.module.sa.prod.group.SaProdGroup; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/sa/proj/main/SaProjMainApi.java b/vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMainApi.java similarity index 87% rename from vboot-application/src/main/java/com/abc/module/sa/proj/main/SaProjMainApi.java rename to vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMainApi.java index da3fbbc..578b1e2 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/proj/main/SaProjMainApi.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMainApi.java @@ -1,10 +1,10 @@ -package com.abc.module.sa.proj.main; +package vboot.app.module.sa.proj.main; -import com.abc.module.sa.prod.group.SaProdGroup; -import com.abc.module.sa.prod.group.SaProdGroupService; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.pojo.Zinp; +import vboot.app.module.sa.prod.group.SaProdGroup; +import vboot.app.module.sa.prod.group.SaProdGroupService; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; +import vboot.core.common.pojo.Zinp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/sa/proj/main/SaProjMainRepo.java b/vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMainRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/sa/proj/main/SaProjMainRepo.java rename to vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMainRepo.java index baeb08d..3ba3ea1 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/proj/main/SaProjMainRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMainRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.sa.proj.main; +package vboot.app.module.sa.proj.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/sa/proj/main/SaProjMainService.java b/vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMainService.java similarity index 82% rename from vboot-application/src/main/java/com/abc/module/sa/proj/main/SaProjMainService.java rename to vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMainService.java index db74df3..4d20cb9 100644 --- a/vboot-application/src/main/java/com/abc/module/sa/proj/main/SaProjMainService.java +++ b/vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMainService.java @@ -1,6 +1,6 @@ -package com.abc.module.sa.proj.main; +package vboot.app.module.sa.proj.main; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/check/TeAllotCheck.java b/vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheck.java similarity index 87% rename from vboot-application/src/main/java/com/abc/module/te/allot/check/TeAllotCheck.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheck.java index 75f140d..9211ba3 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/check/TeAllotCheck.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheck.java @@ -1,6 +1,6 @@ -package com.abc.module.te.allot.check; +package vboot.app.module.te.allot.check; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/check/TeAllotCheckApi.java b/vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckApi.java similarity index 91% rename from vboot-application/src/main/java/com/abc/module/te/allot/check/TeAllotCheckApi.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckApi.java index 5de198c..88cfa13 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/check/TeAllotCheckApi.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckApi.java @@ -1,7 +1,7 @@ -package com.abc.module.te.allot.check; +package vboot.app.module.te.allot.check; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/check/TeAllotCheckItem.java b/vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckItem.java similarity index 92% rename from vboot-application/src/main/java/com/abc/module/te/allot/check/TeAllotCheckItem.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckItem.java index d9806e8..380003f 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/check/TeAllotCheckItem.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckItem.java @@ -1,4 +1,4 @@ -package com.abc.module.te.allot.check; +package vboot.app.module.te.allot.check; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/check/TeAllotCheckRepo.java b/vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/te/allot/check/TeAllotCheckRepo.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckRepo.java index fc387cd..85f5772 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/check/TeAllotCheckRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.te.allot.check; +package vboot.app.module.te.allot.check; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/check/TeAllotCheckService.java b/vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckService.java similarity index 86% rename from vboot-application/src/main/java/com/abc/module/te/allot/check/TeAllotCheckService.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckService.java index eeab8fc..4b80876 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/check/TeAllotCheckService.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckService.java @@ -1,7 +1,7 @@ -package com.abc.module.te.allot.check; +package vboot.app.module.te.allot.check; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.dao.Sqler; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/check/Zcheck.java b/vboot-application/src/main/java/vboot/app/module/te/allot/check/Zcheck.java similarity index 79% rename from vboot-application/src/main/java/com/abc/module/te/allot/check/Zcheck.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/check/Zcheck.java index 2f04718..a7ba111 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/check/Zcheck.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/check/Zcheck.java @@ -1,4 +1,4 @@ -package com.abc.module.te.allot.check; +package vboot.app.module.te.allot.check; import lombok.Data; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/drive/TeAllotDrive.java b/vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDrive.java similarity index 87% rename from vboot-application/src/main/java/com/abc/module/te/allot/drive/TeAllotDrive.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDrive.java index 00739d6..b698983 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/drive/TeAllotDrive.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDrive.java @@ -1,6 +1,6 @@ -package com.abc.module.te.allot.drive; +package vboot.app.module.te.allot.drive; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/drive/TeAllotDriveApi.java b/vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveApi.java similarity index 91% rename from vboot-application/src/main/java/com/abc/module/te/allot/drive/TeAllotDriveApi.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveApi.java index d2fdd4b..6f75192 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/drive/TeAllotDriveApi.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveApi.java @@ -1,7 +1,7 @@ -package com.abc.module.te.allot.drive; +package vboot.app.module.te.allot.drive; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/drive/TeAllotDriveItem.java b/vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveItem.java similarity index 92% rename from vboot-application/src/main/java/com/abc/module/te/allot/drive/TeAllotDriveItem.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveItem.java index 86a125a..de6c992 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/drive/TeAllotDriveItem.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveItem.java @@ -1,4 +1,4 @@ -package com.abc.module.te.allot.drive; +package vboot.app.module.te.allot.drive; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/drive/TeAllotDriveRepo.java b/vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/te/allot/drive/TeAllotDriveRepo.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveRepo.java index 0f53ede..d548303 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/drive/TeAllotDriveRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.te.allot.drive; +package vboot.app.module.te.allot.drive; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/drive/TeAllotDriveService.java b/vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveService.java similarity index 86% rename from vboot-application/src/main/java/com/abc/module/te/allot/drive/TeAllotDriveService.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveService.java index d537ae0..7b6c29e 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/drive/TeAllotDriveService.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveService.java @@ -1,7 +1,7 @@ -package com.abc.module.te.allot.drive; +package vboot.app.module.te.allot.drive; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.dao.Sqler; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/drive/Zdrive.java b/vboot-application/src/main/java/vboot/app/module/te/allot/drive/Zdrive.java similarity index 79% rename from vboot-application/src/main/java/com/abc/module/te/allot/drive/Zdrive.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/drive/Zdrive.java index b971e3d..f51d6c1 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/drive/Zdrive.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/drive/Zdrive.java @@ -1,4 +1,4 @@ -package com.abc.module.te.allot.drive; +package vboot.app.module.te.allot.drive; import lombok.Data; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/link/TeAllotLink.java b/vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLink.java similarity index 87% rename from vboot-application/src/main/java/com/abc/module/te/allot/link/TeAllotLink.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLink.java index 62ccf47..b8cafdb 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/link/TeAllotLink.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLink.java @@ -1,6 +1,6 @@ -package com.abc.module.te.allot.link; +package vboot.app.module.te.allot.link; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/link/TeAllotLinkApi.java b/vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkApi.java similarity index 91% rename from vboot-application/src/main/java/com/abc/module/te/allot/link/TeAllotLinkApi.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkApi.java index b421806..5db7c90 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/link/TeAllotLinkApi.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkApi.java @@ -1,7 +1,7 @@ -package com.abc.module.te.allot.link; +package vboot.app.module.te.allot.link; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/link/TeAllotLinkItem.java b/vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkItem.java similarity index 92% rename from vboot-application/src/main/java/com/abc/module/te/allot/link/TeAllotLinkItem.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkItem.java index 2d329be..0e7583e 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/link/TeAllotLinkItem.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkItem.java @@ -1,4 +1,4 @@ -package com.abc.module.te.allot.link; +package vboot.app.module.te.allot.link; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/link/TeAllotLinkRepo.java b/vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/te/allot/link/TeAllotLinkRepo.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkRepo.java index 142c4b2..8d8d19e 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/link/TeAllotLinkRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.te.allot.link; +package vboot.app.module.te.allot.link; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/link/TeAllotLinkService.java b/vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkService.java similarity index 86% rename from vboot-application/src/main/java/com/abc/module/te/allot/link/TeAllotLinkService.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkService.java index b5c2162..8de729b 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/link/TeAllotLinkService.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkService.java @@ -1,7 +1,7 @@ -package com.abc.module.te.allot.link; +package vboot.app.module.te.allot.link; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.dao.Sqler; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/link/Zlink.java b/vboot-application/src/main/java/vboot/app/module/te/allot/link/Zlink.java similarity index 79% rename from vboot-application/src/main/java/com/abc/module/te/allot/link/Zlink.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/link/Zlink.java index 4a15e5f..23a22e5 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/link/Zlink.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/link/Zlink.java @@ -1,4 +1,4 @@ -package com.abc.module.te.allot.link; +package vboot.app.module.te.allot.link; import lombok.Data; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/param/TeAllotParam.java b/vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParam.java similarity index 88% rename from vboot-application/src/main/java/com/abc/module/te/allot/param/TeAllotParam.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParam.java index f40989f..0b0d303 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/param/TeAllotParam.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParam.java @@ -1,6 +1,6 @@ -package com.abc.module.te.allot.param; +package vboot.app.module.te.allot.param; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/param/TeAllotParamApi.java b/vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamApi.java similarity index 91% rename from vboot-application/src/main/java/com/abc/module/te/allot/param/TeAllotParamApi.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamApi.java index 55f8cb2..1116ef6 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/param/TeAllotParamApi.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamApi.java @@ -1,7 +1,7 @@ -package com.abc.module.te.allot.param; +package vboot.app.module.te.allot.param; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/param/TeAllotParamItem.java b/vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamItem.java similarity index 92% rename from vboot-application/src/main/java/com/abc/module/te/allot/param/TeAllotParamItem.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamItem.java index 205b83d..b070495 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/param/TeAllotParamItem.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamItem.java @@ -1,4 +1,4 @@ -package com.abc.module.te.allot.param; +package vboot.app.module.te.allot.param; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/param/TeAllotParamRepo.java b/vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/te/allot/param/TeAllotParamRepo.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamRepo.java index f6cb05f..c616c8d 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/param/TeAllotParamRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.te.allot.param; +package vboot.app.module.te.allot.param; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/te/allot/param/TeAllotParamService.java b/vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamService.java similarity index 88% rename from vboot-application/src/main/java/com/abc/module/te/allot/param/TeAllotParamService.java rename to vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamService.java index 1544e01..bd1546e 100644 --- a/vboot-application/src/main/java/com/abc/module/te/allot/param/TeAllotParamService.java +++ b/vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamService.java @@ -1,9 +1,9 @@ -package com.abc.module.te.allot.param; +package vboot.app.module.te.allot.param; -import com.abc.module.te.prod.model.Zscreen; -import com.abc.module.te.prod.model.Zparam; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.service.BaseMainService; +import vboot.app.module.te.prod.model.Zparam; +import vboot.app.module.te.prod.model.Zscreen; +import vboot.core.common.dao.Sqler; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/check/TeFeatCheck.java b/vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheck.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/te/feat/check/TeFeatCheck.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheck.java index ee3806f..cddcdde 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/check/TeFeatCheck.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheck.java @@ -1,6 +1,6 @@ -package com.abc.module.te.feat.check; +package vboot.app.module.te.feat.check; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/check/TeFeatCheckApi.java b/vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheckApi.java similarity index 91% rename from vboot-application/src/main/java/com/abc/module/te/feat/check/TeFeatCheckApi.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheckApi.java index ab78906..0e7bcac 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/check/TeFeatCheckApi.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheckApi.java @@ -1,7 +1,7 @@ -package com.abc.module.te.feat.check; +package vboot.app.module.te.feat.check; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/check/TeFeatCheckRepo.java b/vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheckRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/te/feat/check/TeFeatCheckRepo.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheckRepo.java index ad5a037..9351d96 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/check/TeFeatCheckRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheckRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.te.feat.check; +package vboot.app.module.te.feat.check; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/check/TeFeatCheckService.java b/vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheckService.java similarity index 81% rename from vboot-application/src/main/java/com/abc/module/te/feat/check/TeFeatCheckService.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheckService.java index 002576e..3584426 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/check/TeFeatCheckService.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheckService.java @@ -1,6 +1,6 @@ -package com.abc.module.te.feat.check; +package vboot.app.module.te.feat.check; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/comp/TeFeatComp.java b/vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatComp.java similarity index 82% rename from vboot-application/src/main/java/com/abc/module/te/feat/comp/TeFeatComp.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatComp.java index 57bc4a2..6c10972 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/comp/TeFeatComp.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatComp.java @@ -1,9 +1,9 @@ -package com.abc.module.te.feat.comp; +package vboot.app.module.te.feat.comp; -import com.abc.module.te.allot.check.TeAllotCheck; -import com.abc.module.te.allot.drive.TeAllotDrive; -import com.abc.module.te.allot.param.TeAllotParam; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.app.module.te.allot.check.TeAllotCheck; +import vboot.app.module.te.allot.drive.TeAllotDrive; +import vboot.app.module.te.allot.param.TeAllotParam; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/comp/TeFeatCompApi.java b/vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatCompApi.java similarity index 83% rename from vboot-application/src/main/java/com/abc/module/te/feat/comp/TeFeatCompApi.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatCompApi.java index ec5fc8e..9f8d854 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/comp/TeFeatCompApi.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatCompApi.java @@ -1,10 +1,10 @@ -package com.abc.module.te.feat.comp; +package vboot.app.module.te.feat.comp; -import com.abc.module.te.allot.param.TeAllotParamService; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.util.lang.XstringUtil; +import vboot.app.module.te.allot.param.TeAllotParamService; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.xutil.lang.XstringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/comp/TeFeatCompRepo.java b/vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatCompRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/te/feat/comp/TeFeatCompRepo.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatCompRepo.java index 11980c3..a2b3f13 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/comp/TeFeatCompRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatCompRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.te.feat.comp; +package vboot.app.module.te.feat.comp; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/comp/TeFeatCompService.java b/vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatCompService.java similarity index 84% rename from vboot-application/src/main/java/com/abc/module/te/feat/comp/TeFeatCompService.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatCompService.java index 874f7db..94162a2 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/comp/TeFeatCompService.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatCompService.java @@ -1,8 +1,8 @@ -package com.abc.module.te.feat.comp; +package vboot.app.module.te.feat.comp; -import com.abc.module.te.allot.param.TeAllotParamRepo; -import vboot.common.mvc.service.BaseMainService; -import vboot.common.util.lang.XstringUtil; +import vboot.app.module.te.allot.param.TeAllotParamRepo; +import vboot.core.common.service.BaseMainService; +import vboot.core.xutil.lang.XstringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/drive/TeFeatDrive.java b/vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDrive.java similarity index 77% rename from vboot-application/src/main/java/com/abc/module/te/feat/drive/TeFeatDrive.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDrive.java index 1f84e1d..792b5db 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/drive/TeFeatDrive.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDrive.java @@ -1,6 +1,6 @@ -package com.abc.module.te.feat.drive; +package vboot.app.module.te.feat.drive; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/drive/TeFeatDriveApi.java b/vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDriveApi.java similarity index 91% rename from vboot-application/src/main/java/com/abc/module/te/feat/drive/TeFeatDriveApi.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDriveApi.java index 1e24023..6b25d7a 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/drive/TeFeatDriveApi.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDriveApi.java @@ -1,7 +1,7 @@ -package com.abc.module.te.feat.drive; +package vboot.app.module.te.feat.drive; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/drive/TeFeatDriveRepo.java b/vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDriveRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/te/feat/drive/TeFeatDriveRepo.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDriveRepo.java index d03d439..5e670c2 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/drive/TeFeatDriveRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDriveRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.te.feat.drive; +package vboot.app.module.te.feat.drive; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/drive/TeFeatDriveService.java b/vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDriveService.java similarity index 81% rename from vboot-application/src/main/java/com/abc/module/te/feat/drive/TeFeatDriveService.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDriveService.java index a3e65e3..ce3ed01 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/drive/TeFeatDriveService.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDriveService.java @@ -1,6 +1,6 @@ -package com.abc.module.te.feat.drive; +package vboot.app.module.te.feat.drive; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/link/TeFeatLink.java b/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLink.java similarity index 94% rename from vboot-application/src/main/java/com/abc/module/te/feat/link/TeFeatLink.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLink.java index 908c9a8..9582522 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/link/TeFeatLink.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLink.java @@ -1,6 +1,6 @@ -package com.abc.module.te.feat.link; +package vboot.app.module.te.feat.link; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/link/TeFeatLinkApi.java b/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkApi.java similarity index 91% rename from vboot-application/src/main/java/com/abc/module/te/feat/link/TeFeatLinkApi.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkApi.java index 83fe9f4..48fad03 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/link/TeFeatLinkApi.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkApi.java @@ -1,7 +1,7 @@ -package com.abc.module.te.feat.link; +package vboot.app.module.te.feat.link; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/link/TeFeatLinkItem.java b/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkItem.java similarity index 95% rename from vboot-application/src/main/java/com/abc/module/te/feat/link/TeFeatLinkItem.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkItem.java index 3cf6f02..5ffdd96 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/link/TeFeatLinkItem.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkItem.java @@ -1,4 +1,4 @@ -package com.abc.module.te.feat.link; +package vboot.app.module.te.feat.link; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/link/TeFeatLinkLeft.java b/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkLeft.java similarity index 93% rename from vboot-application/src/main/java/com/abc/module/te/feat/link/TeFeatLinkLeft.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkLeft.java index e62e4fd..e70a04e 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/link/TeFeatLinkLeft.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkLeft.java @@ -1,4 +1,4 @@ -package com.abc.module.te.feat.link; +package vboot.app.module.te.feat.link; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/link/TeFeatLinkRepo.java b/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/te/feat/link/TeFeatLinkRepo.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkRepo.java index c19a0ff..8f64631 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/link/TeFeatLinkRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.te.feat.link; +package vboot.app.module.te.feat.link; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/link/TeFeatLinkRight.java b/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkRight.java similarity index 88% rename from vboot-application/src/main/java/com/abc/module/te/feat/link/TeFeatLinkRight.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkRight.java index f263620..adba933 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/link/TeFeatLinkRight.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkRight.java @@ -1,6 +1,6 @@ -package com.abc.module.te.feat.link; +package vboot.app.module.te.feat.link; -import com.abc.module.te.feat.param.TeFeatParamOption; +import vboot.app.module.te.feat.param.TeFeatParamOption; import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.GenericGenerator; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/link/TeFeatLinkService.java b/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkService.java similarity index 82% rename from vboot-application/src/main/java/com/abc/module/te/feat/link/TeFeatLinkService.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkService.java index 85f970f..721a821 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/link/TeFeatLinkService.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkService.java @@ -1,6 +1,6 @@ -package com.abc.module.te.feat.link; +package vboot.app.module.te.feat.link; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/param/TeFeatParam.java b/vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParam.java similarity index 90% rename from vboot-application/src/main/java/com/abc/module/te/feat/param/TeFeatParam.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParam.java index 8d6c478..ea756c7 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/param/TeFeatParam.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParam.java @@ -1,6 +1,6 @@ -package com.abc.module.te.feat.param; +package vboot.app.module.te.feat.param; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/param/TeFeatParamApi.java b/vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamApi.java similarity index 92% rename from vboot-application/src/main/java/com/abc/module/te/feat/param/TeFeatParamApi.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamApi.java index 4911f7a..ca106c6 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/param/TeFeatParamApi.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamApi.java @@ -1,9 +1,9 @@ -package com.abc.module.te.feat.param; +package vboot.app.module.te.feat.param; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.pojo.ZidName; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.common.pojo.ZidName; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/param/TeFeatParamOption.java b/vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamOption.java similarity index 94% rename from vboot-application/src/main/java/com/abc/module/te/feat/param/TeFeatParamOption.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamOption.java index 716477b..c6a84cb 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/param/TeFeatParamOption.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamOption.java @@ -1,4 +1,4 @@ -package com.abc.module.te.feat.param; +package vboot.app.module.te.feat.param; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/param/TeFeatParamRepo.java b/vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/te/feat/param/TeFeatParamRepo.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamRepo.java index 4345af5..334ba85 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/param/TeFeatParamRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.te.feat.param; +package vboot.app.module.te.feat.param; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/param/TeFeatParamService.java b/vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamService.java similarity index 86% rename from vboot-application/src/main/java/com/abc/module/te/feat/param/TeFeatParamService.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamService.java index 96f0e21..fa60384 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/param/TeFeatParamService.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamService.java @@ -1,8 +1,8 @@ -package com.abc.module.te.feat.param; +package vboot.app.module.te.feat.param; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.pojo.ZidName; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.dao.Sqler; +import vboot.core.common.pojo.ZidName; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/screen/TeFeatScreen.java b/vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreen.java similarity index 77% rename from vboot-application/src/main/java/com/abc/module/te/feat/screen/TeFeatScreen.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreen.java index 7240cda..aeecde1 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/screen/TeFeatScreen.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreen.java @@ -1,6 +1,6 @@ -package com.abc.module.te.feat.screen; +package vboot.app.module.te.feat.screen; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/screen/TeFeatScreenApi.java b/vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreenApi.java similarity index 90% rename from vboot-application/src/main/java/com/abc/module/te/feat/screen/TeFeatScreenApi.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreenApi.java index b1b6f7e..3e77dc4 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/screen/TeFeatScreenApi.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreenApi.java @@ -1,8 +1,8 @@ -package com.abc.module.te.feat.screen; +package vboot.app.module.te.feat.screen; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.pojo.Zinp; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; +import vboot.core.common.pojo.Zinp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/screen/TeFeatScreenRepo.java b/vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreenRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/te/feat/screen/TeFeatScreenRepo.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreenRepo.java index 2b25243..d68e493 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/screen/TeFeatScreenRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreenRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.te.feat.screen; +package vboot.app.module.te.feat.screen; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/te/feat/screen/TeFeatScreenService.java b/vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreenService.java similarity index 92% rename from vboot-application/src/main/java/com/abc/module/te/feat/screen/TeFeatScreenService.java rename to vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreenService.java index abf88ce..ff80f02 100644 --- a/vboot-application/src/main/java/com/abc/module/te/feat/screen/TeFeatScreenService.java +++ b/vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreenService.java @@ -1,8 +1,8 @@ -package com.abc.module.te.feat.screen; +package vboot.app.module.te.feat.screen; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.pojo.Zinp; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.dao.Sqler; +import vboot.core.common.pojo.Zinp; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/cate/TeProdCate.java b/vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCate.java similarity index 70% rename from vboot-application/src/main/java/com/abc/module/te/prod/cate/TeProdCate.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCate.java index 0a254da..2f224cf 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/cate/TeProdCate.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCate.java @@ -1,6 +1,6 @@ -package com.abc.module.te.prod.cate; +package vboot.app.module.te.prod.cate; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/cate/TeProdCateApi.java b/vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCateApi.java similarity index 92% rename from vboot-application/src/main/java/com/abc/module/te/prod/cate/TeProdCateApi.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCateApi.java index 74c5447..64a4133 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/cate/TeProdCateApi.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCateApi.java @@ -1,7 +1,7 @@ -package com.abc.module.te.prod.cate; +package vboot.app.module.te.prod.cate; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/cate/TeProdCateRepo.java b/vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCateRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/te/prod/cate/TeProdCateRepo.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCateRepo.java index 5eb2ed8..f9f2355 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/cate/TeProdCateRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCateRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.te.prod.cate; +package vboot.app.module.te.prod.cate; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/cate/TeProdCateService.java b/vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCateService.java similarity index 81% rename from vboot-application/src/main/java/com/abc/module/te/prod/cate/TeProdCateService.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCateService.java index 4d108f9..63be899 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/cate/TeProdCateService.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCateService.java @@ -1,6 +1,6 @@ -package com.abc.module.te.prod.cate; +package vboot.app.module.te.prod.cate; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/model/TeProdModel.java b/vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModel.java similarity index 77% rename from vboot-application/src/main/java/com/abc/module/te/prod/model/TeProdModel.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModel.java index 6b6da60..f57c042 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/model/TeProdModel.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModel.java @@ -1,6 +1,6 @@ -package com.abc.module.te.prod.model; +package vboot.app.module.te.prod.model; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/model/TeProdModelApi.java b/vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModelApi.java similarity index 90% rename from vboot-application/src/main/java/com/abc/module/te/prod/model/TeProdModelApi.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModelApi.java index dcc862f..f258187 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/model/TeProdModelApi.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModelApi.java @@ -1,10 +1,10 @@ -package com.abc.module.te.prod.model; +package vboot.app.module.te.prod.model; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.pojo.Zinp; -import vboot.common.util.lang.XstringUtil; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.common.pojo.Zinp; +import vboot.core.xutil.lang.XstringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/model/TeProdModelRepo.java b/vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModelRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/te/prod/model/TeProdModelRepo.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModelRepo.java index 19eb30a..0dcd603 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/model/TeProdModelRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModelRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.te.prod.model; +package vboot.app.module.te.prod.model; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/model/TeProdModelService.java b/vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModelService.java similarity index 96% rename from vboot-application/src/main/java/com/abc/module/te/prod/model/TeProdModelService.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModelService.java index 14bbcd1..be08734 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/model/TeProdModelService.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModelService.java @@ -1,8 +1,8 @@ -package com.abc.module.te.prod.model; +package vboot.app.module.te.prod.model; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.pojo.Zinp; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.dao.Sqler; +import vboot.core.common.pojo.Zinp; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/model/Zmodel.java b/vboot-application/src/main/java/vboot/app/module/te/prod/model/Zmodel.java similarity index 85% rename from vboot-application/src/main/java/com/abc/module/te/prod/model/Zmodel.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/model/Zmodel.java index 2557c94..3802c1f 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/model/Zmodel.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/model/Zmodel.java @@ -1,4 +1,4 @@ -package com.abc.module.te.prod.model; +package vboot.app.module.te.prod.model; import lombok.Data; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/model/Zparam.java b/vboot-application/src/main/java/vboot/app/module/te/prod/model/Zparam.java similarity index 84% rename from vboot-application/src/main/java/com/abc/module/te/prod/model/Zparam.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/model/Zparam.java index fd40fe0..19732d3 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/model/Zparam.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/model/Zparam.java @@ -1,4 +1,4 @@ -package com.abc.module.te.prod.model; +package vboot.app.module.te.prod.model; import lombok.Data; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/model/Zscreen.java b/vboot-application/src/main/java/vboot/app/module/te/prod/model/Zscreen.java similarity index 85% rename from vboot-application/src/main/java/com/abc/module/te/prod/model/Zscreen.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/model/Zscreen.java index 9c45168..157f68b 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/model/Zscreen.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/model/Zscreen.java @@ -1,4 +1,4 @@ -package com.abc.module.te.prod.model; +package vboot.app.module.te.prod.model; import lombok.Data; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/serie/TeProdSerie.java b/vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerie.java similarity index 77% rename from vboot-application/src/main/java/com/abc/module/te/prod/serie/TeProdSerie.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerie.java index 9a6dc5b..f1327f4 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/serie/TeProdSerie.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerie.java @@ -1,6 +1,6 @@ -package com.abc.module.te.prod.serie; +package vboot.app.module.te.prod.serie; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/serie/TeProdSerieApi.java b/vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerieApi.java similarity index 92% rename from vboot-application/src/main/java/com/abc/module/te/prod/serie/TeProdSerieApi.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerieApi.java index 75de3f0..838fd85 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/serie/TeProdSerieApi.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerieApi.java @@ -1,7 +1,7 @@ -package com.abc.module.te.prod.serie; +package vboot.app.module.te.prod.serie; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/serie/TeProdSerieRepo.java b/vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerieRepo.java similarity index 84% rename from vboot-application/src/main/java/com/abc/module/te/prod/serie/TeProdSerieRepo.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerieRepo.java index a118d92..554d4a9 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/serie/TeProdSerieRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerieRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.te.prod.serie; +package vboot.app.module.te.prod.serie; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/serie/TeProdSerieService.java b/vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerieService.java similarity index 85% rename from vboot-application/src/main/java/com/abc/module/te/prod/serie/TeProdSerieService.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerieService.java index 2e458f9..fe5dcd4 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/serie/TeProdSerieService.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerieService.java @@ -1,6 +1,6 @@ -package com.abc.module.te.prod.serie; +package vboot.app.module.te.prod.serie; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/test/TeProdTest.java b/vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTest.java similarity index 67% rename from vboot-application/src/main/java/com/abc/module/te/prod/test/TeProdTest.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTest.java index ec4adff..2161857 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/test/TeProdTest.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTest.java @@ -1,6 +1,6 @@ -package com.abc.module.te.prod.test; +package vboot.app.module.te.prod.test; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/test/TeProdTestApi.java b/vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTestApi.java similarity index 85% rename from vboot-application/src/main/java/com/abc/module/te/prod/test/TeProdTestApi.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTestApi.java index 6ca8022..bc4f4a4 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/test/TeProdTestApi.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTestApi.java @@ -1,9 +1,9 @@ -package com.abc.module.te.prod.test; +package vboot.app.module.te.prod.test; -import com.abc.module.te.prod.cate.TeProdCate; -import com.abc.module.te.prod.cate.TeProdCateService; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.app.module.te.prod.cate.TeProdCate; +import vboot.app.module.te.prod.cate.TeProdCateService; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/test/TeProdTestRepo.java b/vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTestRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/te/prod/test/TeProdTestRepo.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTestRepo.java index 79bc5bb..841a145 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/test/TeProdTestRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTestRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.te.prod.test; +package vboot.app.module.te.prod.test; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/test/TeProdTestService.java b/vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTestService.java similarity index 82% rename from vboot-application/src/main/java/com/abc/module/te/prod/test/TeProdTestService.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTestService.java index 7e1b11d..17c93df 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/test/TeProdTestService.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTestService.java @@ -1,6 +1,6 @@ -package com.abc.module.te.prod.test; +package vboot.app.module.te.prod.test; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/version/TeProdVersion.java b/vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersion.java similarity index 85% rename from vboot-application/src/main/java/com/abc/module/te/prod/version/TeProdVersion.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersion.java index 3c2dfd8..7c5bf8e 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/version/TeProdVersion.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersion.java @@ -1,9 +1,9 @@ -package com.abc.module.te.prod.version; +package vboot.app.module.te.prod.version; -import com.abc.module.te.allot.check.TeAllotCheck; -import com.abc.module.te.allot.drive.TeAllotDrive; -import com.abc.module.te.allot.param.TeAllotParam; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.app.module.te.allot.check.TeAllotCheck; +import vboot.app.module.te.allot.drive.TeAllotDrive; +import vboot.app.module.te.allot.param.TeAllotParam; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/version/TeProdVersionApi.java b/vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersionApi.java similarity index 85% rename from vboot-application/src/main/java/com/abc/module/te/prod/version/TeProdVersionApi.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersionApi.java index d104a72..62b5d42 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/version/TeProdVersionApi.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersionApi.java @@ -1,10 +1,10 @@ -package com.abc.module.te.prod.version; +package vboot.app.module.te.prod.version; -import com.abc.module.te.allot.param.TeAllotParamService; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.util.lang.XstringUtil; +import vboot.app.module.te.allot.param.TeAllotParamService; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.xutil.lang.XstringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/version/TeProdVersionRepo.java b/vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersionRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/te/prod/version/TeProdVersionRepo.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersionRepo.java index 2f491ca..6ad4200 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/version/TeProdVersionRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersionRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.te.prod.version; +package vboot.app.module.te.prod.version; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/te/prod/version/TeProdVersionService.java b/vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersionService.java similarity index 84% rename from vboot-application/src/main/java/com/abc/module/te/prod/version/TeProdVersionService.java rename to vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersionService.java index d740191..2a84c5c 100644 --- a/vboot-application/src/main/java/com/abc/module/te/prod/version/TeProdVersionService.java +++ b/vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersionService.java @@ -1,8 +1,8 @@ -package com.abc.module.te.prod.version; +package vboot.app.module.te.prod.version; -import com.abc.module.te.allot.param.TeAllotParamRepo; -import vboot.common.mvc.service.BaseMainService; -import vboot.common.util.lang.XstringUtil; +import vboot.app.module.te.allot.param.TeAllotParamRepo; +import vboot.core.common.service.BaseMainService; +import vboot.core.xutil.lang.XstringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/te/tran/cate/TeTranCate.java b/vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCate.java similarity index 70% rename from vboot-application/src/main/java/com/abc/module/te/tran/cate/TeTranCate.java rename to vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCate.java index 3a2e433..724b6ba 100644 --- a/vboot-application/src/main/java/com/abc/module/te/tran/cate/TeTranCate.java +++ b/vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCate.java @@ -1,6 +1,6 @@ -package com.abc.module.te.tran.cate; +package vboot.app.module.te.tran.cate; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/tran/cate/TeTranCateApi.java b/vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCateApi.java similarity index 92% rename from vboot-application/src/main/java/com/abc/module/te/tran/cate/TeTranCateApi.java rename to vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCateApi.java index 9af9a26..f8ee488 100644 --- a/vboot-application/src/main/java/com/abc/module/te/tran/cate/TeTranCateApi.java +++ b/vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCateApi.java @@ -1,7 +1,7 @@ -package com.abc.module.te.tran.cate; +package vboot.app.module.te.tran.cate; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/te/tran/cate/TeTranCateRepo.java b/vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCateRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/te/tran/cate/TeTranCateRepo.java rename to vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCateRepo.java index 105fb3e..dbae676 100644 --- a/vboot-application/src/main/java/com/abc/module/te/tran/cate/TeTranCateRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCateRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.te.tran.cate; +package vboot.app.module.te.tran.cate; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/te/tran/cate/TeTranCateService.java b/vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCateService.java similarity index 81% rename from vboot-application/src/main/java/com/abc/module/te/tran/cate/TeTranCateService.java rename to vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCateService.java index ff732c8..c339e78 100644 --- a/vboot-application/src/main/java/com/abc/module/te/tran/cate/TeTranCateService.java +++ b/vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCateService.java @@ -1,6 +1,6 @@ -package com.abc.module.te.tran.cate; +package vboot.app.module.te.tran.cate; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/te/tran/main/TeTranMain.java b/vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMain.java similarity index 93% rename from vboot-application/src/main/java/com/abc/module/te/tran/main/TeTranMain.java rename to vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMain.java index 93ed6a1..342fc43 100644 --- a/vboot-application/src/main/java/com/abc/module/te/tran/main/TeTranMain.java +++ b/vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMain.java @@ -1,6 +1,6 @@ -package com.abc.module.te.tran.main; +package vboot.app.module.te.tran.main; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/tran/main/TeTranMainApi.java b/vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainApi.java similarity index 92% rename from vboot-application/src/main/java/com/abc/module/te/tran/main/TeTranMainApi.java rename to vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainApi.java index 37c7de0..562aa49 100644 --- a/vboot-application/src/main/java/com/abc/module/te/tran/main/TeTranMainApi.java +++ b/vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainApi.java @@ -1,7 +1,7 @@ -package com.abc.module.te.tran.main; +package vboot.app.module.te.tran.main; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-application/src/main/java/com/abc/module/te/tran/main/TeTranMainItem.java b/vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainItem.java similarity index 95% rename from vboot-application/src/main/java/com/abc/module/te/tran/main/TeTranMainItem.java rename to vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainItem.java index 7cc313b..4c3ee1b 100644 --- a/vboot-application/src/main/java/com/abc/module/te/tran/main/TeTranMainItem.java +++ b/vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainItem.java @@ -1,4 +1,4 @@ -package com.abc.module.te.tran.main; +package vboot.app.module.te.tran.main; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/com/abc/module/te/tran/main/TeTranMainRepo.java b/vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainRepo.java similarity index 78% rename from vboot-application/src/main/java/com/abc/module/te/tran/main/TeTranMainRepo.java rename to vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainRepo.java index af27bca..770df3d 100644 --- a/vboot-application/src/main/java/com/abc/module/te/tran/main/TeTranMainRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.te.tran.main; +package vboot.app.module.te.tran.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/te/tran/main/TeTranMainService.java b/vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainService.java similarity index 81% rename from vboot-application/src/main/java/com/abc/module/te/tran/main/TeTranMainService.java rename to vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainService.java index 32c05b2..e94d75d 100644 --- a/vboot-application/src/main/java/com/abc/module/te/tran/main/TeTranMainService.java +++ b/vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainService.java @@ -1,6 +1,6 @@ -package com.abc.module.te.tran.main; +package vboot.app.module.te.tran.main; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/main/java/com/abc/module/wc/cont/WcCont.java b/vboot-application/src/main/java/vboot/app/module/wc/cont/WcCont.java similarity index 88% rename from vboot-application/src/main/java/com/abc/module/wc/cont/WcCont.java rename to vboot-application/src/main/java/vboot/app/module/wc/cont/WcCont.java index 8ba7873..186452c 100644 --- a/vboot-application/src/main/java/com/abc/module/wc/cont/WcCont.java +++ b/vboot-application/src/main/java/vboot/app/module/wc/cont/WcCont.java @@ -1,4 +1,4 @@ -package com.abc.module.wc.cont; +package vboot.app.module.wc.cont; import lombok.Data; diff --git a/vboot-application/src/main/java/com/abc/module/wc/match/main/Dataxx.java b/vboot-application/src/main/java/vboot/app/module/wc/match/main/Dataxx.java similarity index 95% rename from vboot-application/src/main/java/com/abc/module/wc/match/main/Dataxx.java rename to vboot-application/src/main/java/vboot/app/module/wc/match/main/Dataxx.java index 5d93034..cd923b5 100644 --- a/vboot-application/src/main/java/com/abc/module/wc/match/main/Dataxx.java +++ b/vboot-application/src/main/java/vboot/app/module/wc/match/main/Dataxx.java @@ -1,8 +1,8 @@ -package com.abc.module.wc.match.main; +package vboot.app.module.wc.match.main; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSONObject; -import vboot.common.util.lang.XnumberUtil; +import vboot.core.xutil.lang.XnumberUtil; import java.io.IOException; import java.math.BigDecimal; diff --git a/vboot-application/src/main/java/com/abc/module/wc/match/main/WcMatch.java b/vboot-application/src/main/java/vboot/app/module/wc/match/main/WcMatch.java similarity index 93% rename from vboot-application/src/main/java/com/abc/module/wc/match/main/WcMatch.java rename to vboot-application/src/main/java/vboot/app/module/wc/match/main/WcMatch.java index bdbe8b8..8fb1d68 100644 --- a/vboot-application/src/main/java/com/abc/module/wc/match/main/WcMatch.java +++ b/vboot-application/src/main/java/vboot/app/module/wc/match/main/WcMatch.java @@ -1,4 +1,4 @@ -package com.abc.module.wc.match.main; +package vboot.app.module.wc.match.main; import lombok.Data; diff --git a/vboot-application/src/main/java/com/abc/module/wc/match/main/WcMatchRepo.java b/vboot-application/src/main/java/vboot/app/module/wc/match/main/WcMatchRepo.java similarity index 77% rename from vboot-application/src/main/java/com/abc/module/wc/match/main/WcMatchRepo.java rename to vboot-application/src/main/java/vboot/app/module/wc/match/main/WcMatchRepo.java index 0616d37..077100d 100644 --- a/vboot-application/src/main/java/com/abc/module/wc/match/main/WcMatchRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/wc/match/main/WcMatchRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.wc.match.main; +package vboot.app.module.wc.match.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/wc/palyer/main/WcPlayer.java b/vboot-application/src/main/java/vboot/app/module/wc/palyer/main/WcPlayer.java similarity index 95% rename from vboot-application/src/main/java/com/abc/module/wc/palyer/main/WcPlayer.java rename to vboot-application/src/main/java/vboot/app/module/wc/palyer/main/WcPlayer.java index 0340d94..8394e90 100644 --- a/vboot-application/src/main/java/com/abc/module/wc/palyer/main/WcPlayer.java +++ b/vboot-application/src/main/java/vboot/app/module/wc/palyer/main/WcPlayer.java @@ -1,4 +1,4 @@ -package com.abc.module.wc.palyer.main; +package vboot.app.module.wc.palyer.main; import lombok.Data; diff --git a/vboot-application/src/main/java/com/abc/module/wc/palyer/main/WcPlayerRepo.java b/vboot-application/src/main/java/vboot/app/module/wc/palyer/main/WcPlayerRepo.java similarity index 77% rename from vboot-application/src/main/java/com/abc/module/wc/palyer/main/WcPlayerRepo.java rename to vboot-application/src/main/java/vboot/app/module/wc/palyer/main/WcPlayerRepo.java index 38648b0..be4d9ec 100644 --- a/vboot-application/src/main/java/com/abc/module/wc/palyer/main/WcPlayerRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/wc/palyer/main/WcPlayerRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.wc.palyer.main; +package vboot.app.module.wc.palyer.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/wc/palyer/main/WcPlayerService.java b/vboot-application/src/main/java/vboot/app/module/wc/palyer/main/WcPlayerService.java similarity index 95% rename from vboot-application/src/main/java/com/abc/module/wc/palyer/main/WcPlayerService.java rename to vboot-application/src/main/java/vboot/app/module/wc/palyer/main/WcPlayerService.java index 25899fd..a9470aa 100644 --- a/vboot-application/src/main/java/com/abc/module/wc/palyer/main/WcPlayerService.java +++ b/vboot-application/src/main/java/vboot/app/module/wc/palyer/main/WcPlayerService.java @@ -1,16 +1,16 @@ -package com.abc.module.wc.palyer.main; +package vboot.app.module.wc.palyer.main; import cn.hutool.http.HttpUtil; -import com.abc.module.wc.match.main.WcMatch; -import com.abc.module.wc.match.main.WcMatchRepo; -import com.abc.module.wc.stat.WcStat; -import com.abc.module.wc.stat.WcStatRepo; -import com.abc.module.wc.team.main.WcTeam; -import com.abc.module.wc.team.main.WcTeamRepo; +import vboot.app.module.wc.match.main.WcMatch; +import vboot.app.module.wc.match.main.WcMatchRepo; +import vboot.app.module.wc.stat.WcStat; +import vboot.app.module.wc.stat.WcStatRepo; +import vboot.app.module.wc.team.main.WcTeam; +import vboot.app.module.wc.team.main.WcTeamRepo; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import vboot.common.util.lang.XdateUtil; -import vboot.common.util.lang.XnumberUtil; +import vboot.core.xutil.lang.XdateUtil; +import vboot.core.xutil.lang.XnumberUtil; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.select.Elements; diff --git a/vboot-application/src/main/java/com/abc/module/wc/stat/WcStat.java b/vboot-application/src/main/java/vboot/app/module/wc/stat/WcStat.java similarity index 96% rename from vboot-application/src/main/java/com/abc/module/wc/stat/WcStat.java rename to vboot-application/src/main/java/vboot/app/module/wc/stat/WcStat.java index 9eaf755..1752e16 100644 --- a/vboot-application/src/main/java/com/abc/module/wc/stat/WcStat.java +++ b/vboot-application/src/main/java/vboot/app/module/wc/stat/WcStat.java @@ -1,4 +1,4 @@ -package com.abc.module.wc.stat; +package vboot.app.module.wc.stat; import lombok.Data; diff --git a/vboot-application/src/main/java/com/abc/module/wc/stat/WcStatRepo.java b/vboot-application/src/main/java/vboot/app/module/wc/stat/WcStatRepo.java similarity index 80% rename from vboot-application/src/main/java/com/abc/module/wc/stat/WcStatRepo.java rename to vboot-application/src/main/java/vboot/app/module/wc/stat/WcStatRepo.java index 0ae7393..ae75181 100644 --- a/vboot-application/src/main/java/com/abc/module/wc/stat/WcStatRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/wc/stat/WcStatRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.wc.stat; +package vboot.app.module.wc.stat; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/wc/team/main/WcTeam.java b/vboot-application/src/main/java/vboot/app/module/wc/team/main/WcTeam.java similarity index 90% rename from vboot-application/src/main/java/com/abc/module/wc/team/main/WcTeam.java rename to vboot-application/src/main/java/vboot/app/module/wc/team/main/WcTeam.java index e1441a0..a909a0c 100644 --- a/vboot-application/src/main/java/com/abc/module/wc/team/main/WcTeam.java +++ b/vboot-application/src/main/java/vboot/app/module/wc/team/main/WcTeam.java @@ -1,4 +1,4 @@ -package com.abc.module.wc.team.main; +package vboot.app.module.wc.team.main; import lombok.Data; diff --git a/vboot-application/src/main/java/com/abc/module/wc/team/main/WcTeamRepo.java b/vboot-application/src/main/java/vboot/app/module/wc/team/main/WcTeamRepo.java similarity index 77% rename from vboot-application/src/main/java/com/abc/module/wc/team/main/WcTeamRepo.java rename to vboot-application/src/main/java/vboot/app/module/wc/team/main/WcTeamRepo.java index 8dfc71e..7295e61 100644 --- a/vboot-application/src/main/java/com/abc/module/wc/team/main/WcTeamRepo.java +++ b/vboot-application/src/main/java/vboot/app/module/wc/team/main/WcTeamRepo.java @@ -1,4 +1,4 @@ -package com.abc.module.wc.team.main; +package vboot.app.module.wc.team.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/com/abc/module/wc/team/main/WcTeamService.java b/vboot-application/src/main/java/vboot/app/module/wc/team/main/WcTeamService.java similarity index 88% rename from vboot-application/src/main/java/com/abc/module/wc/team/main/WcTeamService.java rename to vboot-application/src/main/java/vboot/app/module/wc/team/main/WcTeamService.java index ed0c65c..0c18f84 100644 --- a/vboot-application/src/main/java/com/abc/module/wc/team/main/WcTeamService.java +++ b/vboot-application/src/main/java/vboot/app/module/wc/team/main/WcTeamService.java @@ -1,4 +1,4 @@ -package com.abc.module.wc.team.main; +package vboot.app.module.wc.team.main; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-application/src/test/java/com/abc/test/mybpmn/MyTest1.java b/vboot-application/src/test/java/com/abc/test/mybpmn/MyTest1.java deleted file mode 100644 index 4e2b6be..0000000 --- a/vboot-application/src/test/java/com/abc/test/mybpmn/MyTest1.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.abc.test.mybpmn; - -import org.dom4j.Attribute; -import org.dom4j.Document; -import org.dom4j.DocumentException; -import org.dom4j.Element; -import org.dom4j.io.SAXReader; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -import java.io.File; -import java.util.Iterator; -import java.util.List; - - -@SpringBootTest -public class MyTest1 { - - @Test - public void parse(){ - String filename="G:\\vboot\\vboot-java\\vboot-application\\src\\test\\java\\com\\abc\\test\\mybpmn\\bpmn.xml"; - SAXReader reader = new SAXReader(); - Document document = null; - try { - document = reader.read(new File(filename)); - } catch (DocumentException e) { - e.printStackTrace(); - } - // 通过document对象获取根节点bookstore - Element bookStore = document.getRootElement(); - // 通过element对象的elementIterator方法获取迭代器 - Iterator it = bookStore.elementIterator(); - // 遍历迭代器，获取根节点中的信息（书籍） - while (it.hasNext()) { - System.out.println("=====开始遍历某一本书====="); - Element book = (Element) it.next(); - // 获取book的属性名以及 属性值 - List bookAttrs = book.attributes(); - for (Attribute attr : bookAttrs) { - System.out.println("属性名：" + attr.getName() + "--属性值：" - + attr.getValue()); - } - Iterator itt = book.elementIterator(); - while (itt.hasNext()) { - Element bookChild = (Element) itt.next(); - System.out.println("节点名：" + bookChild.getName() + "--节点值：" + bookChild.getStringValue()); - } - System.out.println("=====结束遍历某一本书====="); - } - - } - -// @Test -// public void parse2(){ -// XtimeUtil.calStart(); -// try { -// operService.dStart(""); -// } catch (DocumentException e) { -// e.printStackTrace(); -// } -// XtimeUtil.calEnd(); -// } -// @Autowired -// private WfInsOperService operService; - - - - -} \ No newline at end of file diff --git a/vboot-application/src/test/java/com/abc/test/mybpmn/bpmn.xml b/vboot-application/src/test/java/com/abc/test/mybpmn/bpmn.xml deleted file mode 100644 index 535f846..0000000 --- a/vboot-application/src/test/java/com/abc/test/mybpmn/bpmn.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - - Flow_1u6pmzo - - - 审批节点 - - - - - - - - Flow_0uh8wmt - Flow_1miguqf - - - - 判断审批金额是否大于100 - Flow_1miguqf - Flow_12ug1tp - Flow_1bnjbaa - - - - - - - - - - - Flow_1bnjbaa - Flow_00vdr2t - - - - - - - - - - Flow_12ug1tp - Flow_1t81399 - - - - - - - - - - - - - - - - - - - - Flow_00vdr2t - Flow_1t81399 - Flow_01hb865 - - - - - Flow_01hb865 - - - - 起草节点，表单数据一般从绑定的表单提取 - - - - - - - - - - Flow_1u6pmzo - Flow_0uh8wmt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vboot-core/pom.xml b/vboot-core/pom.xml index 6628187..be1b8aa 100644 --- a/vboot-core/pom.xml +++ b/vboot-core/pom.xml @@ -297,6 +297,12 @@ 3.4.1 + + org.jsoup + jsoup + 1.14.3 + + diff --git a/vboot-core/src/main/java/vboot/config/security/authz/AuthzController.java b/vboot-core/src/main/java/vboot/config/security/authz/AuthzController.java deleted file mode 100644 index ccf30b7..0000000 --- a/vboot-core/src/main/java/vboot/config/security/authz/AuthzController.java +++ /dev/null @@ -1,46 +0,0 @@ -package vboot.config.security.authz; - - -import vboot.common.mvc.api.RestResult; -import vboot.config.security.pojo.Zuser; -import vboot.module.sys.log.login.SysLogLoginService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.Authentication; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; - -@RestController -public class AuthzController { - - - @GetMapping("/getUserInfo") - public RestResult getUserInfo(Authentication auth, HttpServletRequest request) { - Zuser zuser = (Zuser) auth.getPrincipal(); - sysLogLoginService.save(zuser,request); - return RestResult.ok("test"); - } - - @GetMapping("/getPermCode") - public RestResult getPermCode(Authentication auth) { - - return RestResult.ok("test"); - } - - - - - - @GetMapping("/com/getZuser") - public RestResult getZuser(Authentication auth) { - return RestResult.ok("test"); - } - - @Autowired - private SysLogLoginService sysLogLoginService; - - @Autowired - private AuthzService authzService; - -} diff --git a/vboot-core/src/main/java/vboot/config/security/authz/AuthzService.java b/vboot-core/src/main/java/vboot/config/security/authz/AuthzService.java deleted file mode 100644 index d512d09..0000000 --- a/vboot-core/src/main/java/vboot/config/security/authz/AuthzService.java +++ /dev/null @@ -1,66 +0,0 @@ -package vboot.config.security.authz; - -import vboot.common.mvc.dao.JdbcDao; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - - -@Service -@Transactional(rollbackFor = Exception.class) -public class AuthzService { - - -// public List findMenuList(Authentication auth) { -// String sql = "select name,code,path,icon,comp,ornum,id,pid from sys_perm_menu where type in ('D','M') and avtag=1 order by ornum"; -// List list=jdbcDao.getTp().query(sql, (rs, rowNum) -> { -// Zmenu zmenu = new Zmenu(); -// zmenu.setId(rs.getString("id")); -// zmenu.setPid(rs.getString("pid")); -// zmenu.setName(rs.getString("code")); -// zmenu.setPath(rs.getString("path")); -// zmenu.setComponent(rs.getString("comp")); -// Zmeta zmeta = new Zmeta(); -// zmeta.setTitle(rs.getString("name")); -// zmeta.setOrderNo(rs.getInt("ornum")); -// zmeta.setIcon(rs.getString("icon")); -// zmenu.setMeta(zmeta); -// return zmenu; -// }); -// return buildByRecursive(list); -// } -// -// -// //使用递归方法建树 -// public List buildByRecursive(List treeNodes) { -// List trees = new ArrayList<>(); -// for (Zmenu treeNode : treeNodes) { -// if (treeNode.getPid()==null) { -// trees.add(findChildrenByTier(treeNode,treeNodes)); -// } -// } -// return trees; -// } -// -// -// //递归查找子节点 -// public Zmenu findChildrenByTier(Zmenu treeNode, List treeNodes) { -//// treeNode.setChildren(new ArrayList<>()); -// for (Zmenu it : treeNodes) { -// if(treeNode.getId().equals(it.getPid())) { -// if (treeNode.getChildren() == null) { -// treeNode.setChildren(new ArrayList<>()); -// } -// treeNode.getChildren().add(findChildrenByTier(it,treeNodes)); -// } -// } -// return treeNode; -// } - - - @Autowired - private JdbcDao jdbcDao; - - - -} diff --git a/vboot-core/src/main/java/vboot/common/mvc/api/PageData.java b/vboot-core/src/main/java/vboot/core/common/api/PageData.java similarity index 90% rename from vboot-core/src/main/java/vboot/common/mvc/api/PageData.java rename to vboot-core/src/main/java/vboot/core/common/api/PageData.java index c2d1f74..efbe942 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/api/PageData.java +++ b/vboot-core/src/main/java/vboot/core/common/api/PageData.java @@ -1,4 +1,4 @@ -package vboot.common.mvc.api; +package vboot.core.common.api; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/vboot-core/src/main/java/vboot/common/mvc/api/RestResult.java b/vboot-core/src/main/java/vboot/core/common/api/RestResult.java similarity index 98% rename from vboot-core/src/main/java/vboot/common/mvc/api/RestResult.java rename to vboot-core/src/main/java/vboot/core/common/api/RestResult.java index e49ffc4..83840e0 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/api/RestResult.java +++ b/vboot-core/src/main/java/vboot/core/common/api/RestResult.java @@ -1,4 +1,4 @@ -package vboot.common.mvc.api; +package vboot.core.common.api; import java.util.ArrayList; diff --git a/vboot-core/src/main/java/vboot/common/mvc/dao/BaseSqler.java b/vboot-core/src/main/java/vboot/core/common/dao/BaseSqler.java similarity index 84% rename from vboot-core/src/main/java/vboot/common/mvc/dao/BaseSqler.java rename to vboot-core/src/main/java/vboot/core/common/dao/BaseSqler.java index 45681b5..a13072a 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/dao/BaseSqler.java +++ b/vboot-core/src/main/java/vboot/core/common/dao/BaseSqler.java @@ -1,4 +1,4 @@ -package vboot.common.mvc.dao; +package vboot.core.common.dao; import java.sql.SQLException; diff --git a/vboot-core/src/main/java/vboot/common/mvc/dao/CacheDao.java b/vboot-core/src/main/java/vboot/core/common/dao/CacheDao.java similarity index 99% rename from vboot-core/src/main/java/vboot/common/mvc/dao/CacheDao.java rename to vboot-core/src/main/java/vboot/core/common/dao/CacheDao.java index e3edf1d..d2a1996 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/dao/CacheDao.java +++ b/vboot-core/src/main/java/vboot/core/common/dao/CacheDao.java @@ -1,4 +1,4 @@ -package vboot.common.mvc.dao; +package vboot.core.common.dao; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; diff --git a/vboot-core/src/main/java/vboot/common/mvc/dao/Dsqler.java b/vboot-core/src/main/java/vboot/core/common/dao/Dsqler.java similarity index 97% rename from vboot-core/src/main/java/vboot/common/mvc/dao/Dsqler.java rename to vboot-core/src/main/java/vboot/core/common/dao/Dsqler.java index 076a39a..ace609d 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/dao/Dsqler.java +++ b/vboot-core/src/main/java/vboot/core/common/dao/Dsqler.java @@ -1,4 +1,4 @@ -package vboot.common.mvc.dao; +package vboot.core.common.dao; import java.sql.SQLException; import java.util.ArrayList; diff --git a/vboot-core/src/main/java/vboot/common/mvc/dao/Isqler.java b/vboot-core/src/main/java/vboot/core/common/dao/Isqler.java similarity index 97% rename from vboot-core/src/main/java/vboot/common/mvc/dao/Isqler.java rename to vboot-core/src/main/java/vboot/core/common/dao/Isqler.java index c3a13cb..734a6ba 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/dao/Isqler.java +++ b/vboot-core/src/main/java/vboot/core/common/dao/Isqler.java @@ -1,4 +1,4 @@ -package vboot.common.mvc.dao; +package vboot.core.common.dao; import java.util.ArrayList; import java.util.List; diff --git a/vboot-core/src/main/java/vboot/common/mvc/dao/JdbcDao.java b/vboot-core/src/main/java/vboot/core/common/dao/JdbcDao.java similarity index 95% rename from vboot-core/src/main/java/vboot/common/mvc/dao/JdbcDao.java rename to vboot-core/src/main/java/vboot/core/common/dao/JdbcDao.java index 14d8e68..4d40abe 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/dao/JdbcDao.java +++ b/vboot-core/src/main/java/vboot/core/common/dao/JdbcDao.java @@ -1,13 +1,13 @@ -package vboot.common.mvc.dao; +package vboot.core.common.dao; -import vboot.module.sys.org.root.SysOrg; -import vboot.common.mvc.api.PageData; -import vboot.common.mvc.pojo.ZidName; -import vboot.common.mvc.pojo.Zinp; -import vboot.common.mvc.pojo.Ztree; -import vboot.common.util.lang.XjsonUtil; -import vboot.common.util.lang.XstringUtil; -import vboot.common.util.web.XreqUtil; +import vboot.core.module.sys.org.root.SysOrg; +import vboot.core.common.api.PageData; +import vboot.core.common.pojo.ZidName; +import vboot.core.common.pojo.Zinp; +import vboot.core.common.pojo.Ztree; +import vboot.core.xutil.lang.XjsonUtil; +import vboot.core.xutil.lang.XstringUtil; +import vboot.core.xutil.web.XreqUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; diff --git a/vboot-core/src/main/java/vboot/common/mvc/dao/Sqler.java b/vboot-core/src/main/java/vboot/core/common/dao/Sqler.java similarity index 99% rename from vboot-core/src/main/java/vboot/common/mvc/dao/Sqler.java rename to vboot-core/src/main/java/vboot/core/common/dao/Sqler.java index 88df40d..0947b0a 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/dao/Sqler.java +++ b/vboot-core/src/main/java/vboot/core/common/dao/Sqler.java @@ -1,8 +1,8 @@ -package vboot.common.mvc.dao; +package vboot.core.common.dao; -import vboot.common.util.lang.XstringUtil; -import vboot.config.security.pojo.Zuser; +import vboot.core.xutil.lang.XstringUtil; +import vboot.core.security.pojo.Zuser; import java.util.ArrayList; import java.util.List; diff --git a/vboot-core/src/main/java/vboot/common/mvc/dao/Usqler.java b/vboot-core/src/main/java/vboot/core/common/dao/Usqler.java similarity index 98% rename from vboot-core/src/main/java/vboot/common/mvc/dao/Usqler.java rename to vboot-core/src/main/java/vboot/core/common/dao/Usqler.java index 5d6ff61..8cb65de 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/dao/Usqler.java +++ b/vboot-core/src/main/java/vboot/core/common/dao/Usqler.java @@ -1,4 +1,4 @@ -package vboot.common.mvc.dao; +package vboot.core.common.dao; import java.sql.SQLException; import java.util.ArrayList; diff --git a/vboot-core/src/main/java/vboot/common/mvc/entity/BaseCateEntity.java b/vboot-core/src/main/java/vboot/core/common/entity/BaseCateEntity.java similarity index 95% rename from vboot-core/src/main/java/vboot/common/mvc/entity/BaseCateEntity.java rename to vboot-core/src/main/java/vboot/core/common/entity/BaseCateEntity.java index 083f8ab..ef21021 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/entity/BaseCateEntity.java +++ b/vboot-core/src/main/java/vboot/core/common/entity/BaseCateEntity.java @@ -1,6 +1,6 @@ -package vboot.common.mvc.entity; +package vboot.core.common.entity; -import vboot.module.sys.org.root.SysOrg; +import vboot.core.module.sys.org.root.SysOrg; import lombok.Getter; import lombok.Setter; diff --git a/vboot-core/src/main/java/vboot/common/mvc/entity/BaseEntity.java b/vboot-core/src/main/java/vboot/core/common/entity/BaseEntity.java similarity index 90% rename from vboot-core/src/main/java/vboot/common/mvc/entity/BaseEntity.java rename to vboot-core/src/main/java/vboot/core/common/entity/BaseEntity.java index 0589356..a442058 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/entity/BaseEntity.java +++ b/vboot-core/src/main/java/vboot/core/common/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package vboot.common.mvc.entity; +package vboot.core.common.entity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-core/src/main/java/vboot/common/mvc/entity/BaseMainEntity.java b/vboot-core/src/main/java/vboot/core/common/entity/BaseMainEntity.java similarity index 94% rename from vboot-core/src/main/java/vboot/common/mvc/entity/BaseMainEntity.java rename to vboot-core/src/main/java/vboot/core/common/entity/BaseMainEntity.java index 0e7ab5d..0ad2c53 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/entity/BaseMainEntity.java +++ b/vboot-core/src/main/java/vboot/core/common/entity/BaseMainEntity.java @@ -1,7 +1,7 @@ -package vboot.common.mvc.entity; +package vboot.core.common.entity; import com.alibaba.excel.annotation.ExcelIgnore; -import vboot.module.sys.org.root.SysOrg; +import vboot.core.module.sys.org.root.SysOrg; import lombok.Getter; import lombok.Setter; diff --git a/vboot-core/src/main/java/vboot/common/mvc/exception/BadConfigurationException.java b/vboot-core/src/main/java/vboot/core/common/exception/BadConfigurationException.java similarity index 98% rename from vboot-core/src/main/java/vboot/common/mvc/exception/BadConfigurationException.java rename to vboot-core/src/main/java/vboot/core/common/exception/BadConfigurationException.java index 7e873f0..d77a01c 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/exception/BadConfigurationException.java +++ b/vboot-core/src/main/java/vboot/core/common/exception/BadConfigurationException.java @@ -1,4 +1,4 @@ -package vboot.common.mvc.exception; +package vboot.core.common.exception; public class BadConfigurationException extends RuntimeException { /** diff --git a/vboot-core/src/main/java/vboot/common/mvc/exception/BadRequestException.java b/vboot-core/src/main/java/vboot/core/common/exception/BadRequestException.java similarity index 92% rename from vboot-core/src/main/java/vboot/common/mvc/exception/BadRequestException.java rename to vboot-core/src/main/java/vboot/core/common/exception/BadRequestException.java index f780534..7a49a25 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/exception/BadRequestException.java +++ b/vboot-core/src/main/java/vboot/core/common/exception/BadRequestException.java @@ -1,4 +1,4 @@ -package vboot.common.mvc.exception; +package vboot.core.common.exception; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/vboot-core/src/main/java/vboot/common/mvc/exception/EntityExistException.java b/vboot-core/src/main/java/vboot/core/common/exception/EntityExistException.java similarity index 92% rename from vboot-core/src/main/java/vboot/common/mvc/exception/EntityExistException.java rename to vboot-core/src/main/java/vboot/core/common/exception/EntityExistException.java index d7af85b..51193fb 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/exception/EntityExistException.java +++ b/vboot-core/src/main/java/vboot/core/common/exception/EntityExistException.java @@ -1,4 +1,4 @@ -package vboot.common.mvc.exception; +package vboot.core.common.exception; import org.springframework.util.StringUtils; diff --git a/vboot-core/src/main/java/vboot/common/mvc/exception/EntityNotFoundException.java b/vboot-core/src/main/java/vboot/core/common/exception/EntityNotFoundException.java similarity index 92% rename from vboot-core/src/main/java/vboot/common/mvc/exception/EntityNotFoundException.java rename to vboot-core/src/main/java/vboot/core/common/exception/EntityNotFoundException.java index e4698f7..7607afa 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/exception/EntityNotFoundException.java +++ b/vboot-core/src/main/java/vboot/core/common/exception/EntityNotFoundException.java @@ -1,4 +1,4 @@ -package vboot.common.mvc.exception; +package vboot.core.common.exception; import org.springframework.util.StringUtils; diff --git a/vboot-core/src/main/java/vboot/common/mvc/exception/handler/ApiError.java b/vboot-core/src/main/java/vboot/core/common/exception/handler/ApiError.java similarity index 94% rename from vboot-core/src/main/java/vboot/common/mvc/exception/handler/ApiError.java rename to vboot-core/src/main/java/vboot/core/common/exception/handler/ApiError.java index ec3afc6..ba04175 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/exception/handler/ApiError.java +++ b/vboot-core/src/main/java/vboot/core/common/exception/handler/ApiError.java @@ -1,4 +1,4 @@ -package vboot.common.mvc.exception.handler; +package vboot.core.common.exception.handler; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/vboot-core/src/main/java/vboot/common/mvc/exception/handler/GlobalExceptionHandler.java b/vboot-core/src/main/java/vboot/core/common/exception/handler/GlobalExceptionHandler.java similarity index 93% rename from vboot-core/src/main/java/vboot/common/mvc/exception/handler/GlobalExceptionHandler.java rename to vboot-core/src/main/java/vboot/core/common/exception/handler/GlobalExceptionHandler.java index 9f0243a..ae0e2d9 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/exception/handler/GlobalExceptionHandler.java +++ b/vboot-core/src/main/java/vboot/core/common/exception/handler/GlobalExceptionHandler.java @@ -1,8 +1,8 @@ -package vboot.common.mvc.exception.handler; +package vboot.core.common.exception.handler; -import vboot.common.mvc.exception.BadRequestException; -import vboot.common.mvc.exception.EntityExistException; -import vboot.common.mvc.exception.EntityNotFoundException; +import vboot.core.common.exception.BadRequestException; +import vboot.core.common.exception.EntityExistException; +import vboot.core.common.exception.EntityNotFoundException; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/vboot-core/src/main/java/vboot/common/mvc/exception/handler/ThrowableUtil.java b/vboot-core/src/main/java/vboot/core/common/exception/handler/ThrowableUtil.java similarity index 89% rename from vboot-core/src/main/java/vboot/common/mvc/exception/handler/ThrowableUtil.java rename to vboot-core/src/main/java/vboot/core/common/exception/handler/ThrowableUtil.java index 6986204..3189961 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/exception/handler/ThrowableUtil.java +++ b/vboot-core/src/main/java/vboot/core/common/exception/handler/ThrowableUtil.java @@ -1,4 +1,4 @@ -package vboot.common.mvc.exception.handler; +package vboot.core.common.exception.handler; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/vboot-core/src/main/java/vboot/common/mvc/others/MapHelper.java b/vboot-core/src/main/java/vboot/core/common/others/MapHelper.java similarity index 94% rename from vboot-core/src/main/java/vboot/common/mvc/others/MapHelper.java rename to vboot-core/src/main/java/vboot/core/common/others/MapHelper.java index 6580d30..30d1ad3 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/others/MapHelper.java +++ b/vboot-core/src/main/java/vboot/core/common/others/MapHelper.java @@ -1,4 +1,4 @@ -package vboot.common.mvc.others; +package vboot.core.common.others; import java.util.LinkedHashMap; import java.util.List; diff --git a/vboot-core/src/main/java/vboot/common/mvc/pojo/Zconn.java b/vboot-core/src/main/java/vboot/core/common/pojo/Zconn.java similarity index 97% rename from vboot-core/src/main/java/vboot/common/mvc/pojo/Zconn.java rename to vboot-core/src/main/java/vboot/core/common/pojo/Zconn.java index cb9e90c..154c684 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/pojo/Zconn.java +++ b/vboot-core/src/main/java/vboot/core/common/pojo/Zconn.java @@ -1,4 +1,4 @@ -package vboot.common.mvc.pojo; +package vboot.core.common.pojo; diff --git a/vboot-core/src/main/java/vboot/common/mvc/pojo/ZidName.java b/vboot-core/src/main/java/vboot/core/common/pojo/ZidName.java similarity index 95% rename from vboot-core/src/main/java/vboot/common/mvc/pojo/ZidName.java rename to vboot-core/src/main/java/vboot/core/common/pojo/ZidName.java index 386e1fd..db6754d 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/pojo/ZidName.java +++ b/vboot-core/src/main/java/vboot/core/common/pojo/ZidName.java @@ -1,4 +1,4 @@ -package vboot.common.mvc.pojo; +package vboot.core.common.pojo; public class ZidName diff --git a/vboot-core/src/main/java/vboot/common/mvc/pojo/Zinp.java b/vboot-core/src/main/java/vboot/core/common/pojo/Zinp.java similarity index 96% rename from vboot-core/src/main/java/vboot/common/mvc/pojo/Zinp.java rename to vboot-core/src/main/java/vboot/core/common/pojo/Zinp.java index 43c5850..9b78063 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/pojo/Zinp.java +++ b/vboot-core/src/main/java/vboot/core/common/pojo/Zinp.java @@ -1,4 +1,4 @@ -package vboot.common.mvc.pojo; +package vboot.core.common.pojo; import java.util.List; diff --git a/vboot-core/src/main/java/vboot/common/mvc/pojo/Ztree.java b/vboot-core/src/main/java/vboot/core/common/pojo/Ztree.java similarity index 90% rename from vboot-core/src/main/java/vboot/common/mvc/pojo/Ztree.java rename to vboot-core/src/main/java/vboot/core/common/pojo/Ztree.java index 4c325d0..6546d4e 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/pojo/Ztree.java +++ b/vboot-core/src/main/java/vboot/core/common/pojo/Ztree.java @@ -1,4 +1,4 @@ -package vboot.common.mvc.pojo; +package vboot.core.common.pojo; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/vboot-core/src/main/java/vboot/common/mvc/service/BaseCateService.java b/vboot-core/src/main/java/vboot/core/common/service/BaseCateService.java similarity index 94% rename from vboot-core/src/main/java/vboot/common/mvc/service/BaseCateService.java rename to vboot-core/src/main/java/vboot/core/common/service/BaseCateService.java index e206701..38f9f70 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/service/BaseCateService.java +++ b/vboot-core/src/main/java/vboot/core/common/service/BaseCateService.java @@ -1,15 +1,15 @@ -package vboot.common.mvc.service; +package vboot.core.common.service; -import vboot.common.mvc.api.PageData; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.entity.BaseCateEntity; -import vboot.common.mvc.pojo.ZidName; -import vboot.common.mvc.pojo.Zinp; -import vboot.common.mvc.pojo.Ztree; -import vboot.common.util.lang.XstringUtil; -import vboot.common.util.web.XuserUtil; +import vboot.core.common.api.PageData; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.common.entity.BaseCateEntity; +import vboot.core.common.pojo.ZidName; +import vboot.core.common.pojo.Zinp; +import vboot.core.common.pojo.Ztree; +import vboot.core.xutil.lang.XstringUtil; +import vboot.core.xutil.web.XuserUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.transaction.annotation.Transactional; diff --git a/vboot-core/src/main/java/vboot/common/mvc/service/BaseMainService.java b/vboot-core/src/main/java/vboot/core/common/service/BaseMainService.java similarity index 89% rename from vboot-core/src/main/java/vboot/common/mvc/service/BaseMainService.java rename to vboot-core/src/main/java/vboot/core/common/service/BaseMainService.java index cf75ad3..4946029 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/service/BaseMainService.java +++ b/vboot-core/src/main/java/vboot/core/common/service/BaseMainService.java @@ -1,11 +1,11 @@ -package vboot.common.mvc.service; +package vboot.core.common.service; -import vboot.common.mvc.api.PageData; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.entity.BaseMainEntity; -import vboot.common.util.lang.XstringUtil; -import vboot.common.util.web.XuserUtil; +import vboot.core.common.api.PageData; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.common.entity.BaseMainEntity; +import vboot.core.xutil.lang.XstringUtil; +import vboot.core.xutil.web.XuserUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.transaction.annotation.Transactional; diff --git a/vboot-core/src/main/java/vboot/common/mvc/service/BaseService.java b/vboot-core/src/main/java/vboot/core/common/service/BaseService.java similarity index 89% rename from vboot-core/src/main/java/vboot/common/mvc/service/BaseService.java rename to vboot-core/src/main/java/vboot/core/common/service/BaseService.java index 6558dce..990e4f3 100644 --- a/vboot-core/src/main/java/vboot/common/mvc/service/BaseService.java +++ b/vboot-core/src/main/java/vboot/core/common/service/BaseService.java @@ -1,10 +1,10 @@ -package vboot.common.mvc.service; +package vboot.core.common.service; -import vboot.common.mvc.api.PageData; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.entity.BaseEntity; -import vboot.common.util.lang.XstringUtil; +import vboot.core.common.api.PageData; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.common.entity.BaseEntity; +import vboot.core.xutil.lang.XstringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.transaction.annotation.Transactional; diff --git a/vboot-core/src/main/java/vboot/config/AppConfig.java b/vboot-core/src/main/java/vboot/core/config/AppConfig.java similarity index 98% rename from vboot-core/src/main/java/vboot/config/AppConfig.java rename to vboot-core/src/main/java/vboot/core/config/AppConfig.java index 1c407fe..6f277b5 100644 --- a/vboot-core/src/main/java/vboot/config/AppConfig.java +++ b/vboot-core/src/main/java/vboot/core/config/AppConfig.java @@ -1,4 +1,4 @@ -package vboot.config; +package vboot.core.config; import lombok.Getter; import lombok.Setter; diff --git a/vboot-core/src/main/java/vboot/config/db/PrimaryDataSourceConfig.java b/vboot-core/src/main/java/vboot/core/config/db/PrimaryDataSourceConfig.java similarity index 96% rename from vboot-core/src/main/java/vboot/config/db/PrimaryDataSourceConfig.java rename to vboot-core/src/main/java/vboot/core/config/db/PrimaryDataSourceConfig.java index c5454f4..ca99632 100644 --- a/vboot-core/src/main/java/vboot/config/db/PrimaryDataSourceConfig.java +++ b/vboot-core/src/main/java/vboot/core/config/db/PrimaryDataSourceConfig.java @@ -1,4 +1,4 @@ -package vboot.config.db; +package vboot.core.config.db; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/vboot-core/src/main/java/vboot/config/db/PrimaryJpaConfig.java b/vboot-core/src/main/java/vboot/core/config/db/PrimaryJpaConfig.java similarity index 94% rename from vboot-core/src/main/java/vboot/config/db/PrimaryJpaConfig.java rename to vboot-core/src/main/java/vboot/core/config/db/PrimaryJpaConfig.java index f3715aa..9af1da5 100644 --- a/vboot-core/src/main/java/vboot/config/db/PrimaryJpaConfig.java +++ b/vboot-core/src/main/java/vboot/core/config/db/PrimaryJpaConfig.java @@ -1,4 +1,4 @@ -package vboot.config.db; +package vboot.core.config.db; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -39,7 +39,7 @@ public class PrimaryJpaConfig { Map map = new HashMap<>(); // map.put("hibernate.dialect", "org.hibernate.dialect.MySQL5InnoDBDialect"); map.put("hibernate.hbm2ddl.auto", DDL_AUTO); - map.put("hibernate.physical_naming_strategy", "vboot.config.db.VbootNamingStrategy"); + map.put("hibernate.physical_naming_strategy", "vboot.core.config.db.VbootNamingStrategy"); return map; } diff --git a/vboot-core/src/main/java/vboot/config/db/VbootNamingStrategy.java b/vboot-core/src/main/java/vboot/core/config/db/VbootNamingStrategy.java similarity index 98% rename from vboot-core/src/main/java/vboot/config/db/VbootNamingStrategy.java rename to vboot-core/src/main/java/vboot/core/config/db/VbootNamingStrategy.java index 1f6292f..6aa8b85 100644 --- a/vboot-core/src/main/java/vboot/config/db/VbootNamingStrategy.java +++ b/vboot-core/src/main/java/vboot/core/config/db/VbootNamingStrategy.java @@ -1,4 +1,4 @@ -package vboot.config.db; +package vboot.core.config.db; import org.hibernate.boot.model.naming.Identifier; import org.hibernate.boot.model.naming.PhysicalNamingStrategy; diff --git a/vboot-core/src/main/java/vboot/config/db/init/DbInitListener.java b/vboot-core/src/main/java/vboot/core/config/db/init/DbInitListener.java similarity index 95% rename from vboot-core/src/main/java/vboot/config/db/init/DbInitListener.java rename to vboot-core/src/main/java/vboot/core/config/db/init/DbInitListener.java index 8b029fa..da8e243 100644 --- a/vboot-core/src/main/java/vboot/config/db/init/DbInitListener.java +++ b/vboot-core/src/main/java/vboot/core/config/db/init/DbInitListener.java @@ -1,6 +1,6 @@ -package vboot.config.db.init; +package vboot.core.config.db.init; -import vboot.module.sys.org.user.SysOrgUserRepo; +import vboot.core.module.sys.org.user.SysOrgUserRepo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/vboot-core/src/main/java/vboot/config/db/init/SysOrgInit.java b/vboot-core/src/main/java/vboot/core/config/db/init/SysOrgInit.java similarity index 96% rename from vboot-core/src/main/java/vboot/config/db/init/SysOrgInit.java rename to vboot-core/src/main/java/vboot/core/config/db/init/SysOrgInit.java index 3ca655b..fcea445 100644 --- a/vboot-core/src/main/java/vboot/config/db/init/SysOrgInit.java +++ b/vboot-core/src/main/java/vboot/core/config/db/init/SysOrgInit.java @@ -1,12 +1,12 @@ -package vboot.config.db.init; +package vboot.core.config.db.init; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.util.lang.XstringUtil; -import vboot.module.sys.org.dept.SysOrgDept; -import vboot.module.sys.org.dept.SysOrgDeptService; -import vboot.module.sys.org.root.SysOrg; -import vboot.module.sys.org.user.SysOrgUser; -import vboot.module.sys.org.user.SysOrgUserService; +import vboot.core.common.dao.JdbcDao; +import vboot.core.xutil.lang.XstringUtil; +import vboot.core.module.sys.org.dept.SysOrgDept; +import vboot.core.module.sys.org.dept.SysOrgDeptService; +import vboot.core.module.sys.org.root.SysOrg; +import vboot.core.module.sys.org.user.SysOrgUser; +import vboot.core.module.sys.org.user.SysOrgUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/vboot-core/src/main/java/vboot/config/db/init/SysPermInit.java b/vboot-core/src/main/java/vboot/core/config/db/init/SysPermInit.java similarity index 96% rename from vboot-core/src/main/java/vboot/config/db/init/SysPermInit.java rename to vboot-core/src/main/java/vboot/core/config/db/init/SysPermInit.java index 8fc8cf4..432f0f5 100644 --- a/vboot-core/src/main/java/vboot/config/db/init/SysPermInit.java +++ b/vboot-core/src/main/java/vboot/core/config/db/init/SysPermInit.java @@ -1,7 +1,7 @@ -package vboot.config.db.init; +package vboot.core.config.db.init; -import vboot.module.sys.perm.menu.SysPermMenu; -import vboot.module.sys.perm.menu.SysPermMenuService; +import vboot.core.module.sys.perm.menu.SysPermMenu; +import vboot.core.module.sys.perm.menu.SysPermMenuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/vboot-core/src/main/java/vboot/config/db/jpa/Comment.java b/vboot-core/src/main/java/vboot/core/config/db/jpa/Comment.java similarity index 90% rename from vboot-core/src/main/java/vboot/config/db/jpa/Comment.java rename to vboot-core/src/main/java/vboot/core/config/db/jpa/Comment.java index 0589db8..24bda72 100644 --- a/vboot-core/src/main/java/vboot/config/db/jpa/Comment.java +++ b/vboot-core/src/main/java/vboot/core/config/db/jpa/Comment.java @@ -1,4 +1,4 @@ -package vboot.config.db.jpa; +package vboot.core.config.db.jpa; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vboot-core/src/main/java/vboot/config/db/jpa/CommentIntegrator.java b/vboot-core/src/main/java/vboot/core/config/db/jpa/CommentIntegrator.java similarity index 99% rename from vboot-core/src/main/java/vboot/config/db/jpa/CommentIntegrator.java rename to vboot-core/src/main/java/vboot/core/config/db/jpa/CommentIntegrator.java index ddd3692..37ae4b2 100644 --- a/vboot-core/src/main/java/vboot/config/db/jpa/CommentIntegrator.java +++ b/vboot-core/src/main/java/vboot/core/config/db/jpa/CommentIntegrator.java @@ -1,4 +1,4 @@ -package vboot.config.db.jpa; +package vboot.core.config.db.jpa; import org.hibernate.boot.Metadata; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/vboot-core/src/main/java/vboot/config/db/jpa/HibernateConfig.java b/vboot-core/src/main/java/vboot/core/config/db/jpa/HibernateConfig.java similarity index 95% rename from vboot-core/src/main/java/vboot/config/db/jpa/HibernateConfig.java rename to vboot-core/src/main/java/vboot/core/config/db/jpa/HibernateConfig.java index ee8fe53..a209f64 100644 --- a/vboot-core/src/main/java/vboot/config/db/jpa/HibernateConfig.java +++ b/vboot-core/src/main/java/vboot/core/config/db/jpa/HibernateConfig.java @@ -1,4 +1,4 @@ -package vboot.config.db.jpa; +package vboot.core.config.db.jpa; import org.hibernate.jpa.boot.spi.IntegratorProvider; import org.springframework.boot.autoconfigure.orm.jpa.HibernatePropertiesCustomizer; diff --git a/vboot-core/src/main/java/vboot/config/dbx/ldap/LdapConfig.java b/vboot-core/src/main/java/vboot/core/config/dbx/ldap/LdapConfig.java similarity index 97% rename from vboot-core/src/main/java/vboot/config/dbx/ldap/LdapConfig.java rename to vboot-core/src/main/java/vboot/core/config/dbx/ldap/LdapConfig.java index c27cf7a..12ed359 100644 --- a/vboot-core/src/main/java/vboot/config/dbx/ldap/LdapConfig.java +++ b/vboot-core/src/main/java/vboot/core/config/dbx/ldap/LdapConfig.java @@ -1,4 +1,4 @@ -package vboot.config.dbx.ldap; +package vboot.core.config.dbx.ldap; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/vboot-core/src/main/java/vboot/config/security/authn/LdapService.java b/vboot-core/src/main/java/vboot/core/config/dbx/ldap/LdapHandler.java similarity index 89% rename from vboot-core/src/main/java/vboot/config/security/authn/LdapService.java rename to vboot-core/src/main/java/vboot/core/config/dbx/ldap/LdapHandler.java index 671a4a4..33bebbf 100644 --- a/vboot-core/src/main/java/vboot/config/security/authn/LdapService.java +++ b/vboot-core/src/main/java/vboot/core/config/dbx/ldap/LdapHandler.java @@ -1,15 +1,16 @@ -package vboot.config.security.authn; +package vboot.core.config.dbx.ldap; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.support.LdapUtils; +import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import javax.naming.directory.DirContext; -@Service -public class LdapService { +@Component +public class LdapHandler { @Autowired private LdapTemplate ldapTemplate; diff --git a/vboot-core/src/main/java/vboot/config/dbx/redis/RedisConfig.java b/vboot-core/src/main/java/vboot/core/config/dbx/redis/RedisConfig.java similarity index 98% rename from vboot-core/src/main/java/vboot/config/dbx/redis/RedisConfig.java rename to vboot-core/src/main/java/vboot/core/config/dbx/redis/RedisConfig.java index 9181436..78a860b 100644 --- a/vboot-core/src/main/java/vboot/config/dbx/redis/RedisConfig.java +++ b/vboot-core/src/main/java/vboot/core/config/dbx/redis/RedisConfig.java @@ -1,11 +1,11 @@ -package vboot.config.dbx.redis; +package vboot.core.config.dbx.redis; import cn.hutool.core.lang.Assert; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.serializer.SerializerFeature; import lombok.extern.slf4j.Slf4j; -import vboot.common.util.lang.XstringUtil; +import vboot.core.xutil.lang.XstringUtil; import org.apache.commons.codec.digest.DigestUtils; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/vboot-core/src/main/java/vboot/config/dbx/redis/RedisHandler.java b/vboot-core/src/main/java/vboot/core/config/dbx/redis/RedisHandler.java similarity index 99% rename from vboot-core/src/main/java/vboot/config/dbx/redis/RedisHandler.java rename to vboot-core/src/main/java/vboot/core/config/dbx/redis/RedisHandler.java index 3dac4c4..dbecc73 100644 --- a/vboot-core/src/main/java/vboot/config/dbx/redis/RedisHandler.java +++ b/vboot-core/src/main/java/vboot/core/config/dbx/redis/RedisHandler.java @@ -1,4 +1,4 @@ -package vboot.config.dbx.redis; +package vboot.core.config.dbx.redis; import com.google.common.collect.Lists; import com.google.common.collect.Sets; diff --git a/vboot-core/src/main/java/vboot/config/web/CorsConfig.java b/vboot-core/src/main/java/vboot/core/config/web/CorsConfig.java similarity index 96% rename from vboot-core/src/main/java/vboot/config/web/CorsConfig.java rename to vboot-core/src/main/java/vboot/core/config/web/CorsConfig.java index be035f1..e4052e9 100644 --- a/vboot-core/src/main/java/vboot/config/web/CorsConfig.java +++ b/vboot-core/src/main/java/vboot/core/config/web/CorsConfig.java @@ -1,4 +1,4 @@ -package vboot.config.web; +package vboot.core.config.web; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/vboot-core/src/main/java/vboot/config/web/RestTemplateConfig.java b/vboot-core/src/main/java/vboot/core/config/web/RestTemplateConfig.java similarity index 99% rename from vboot-core/src/main/java/vboot/config/web/RestTemplateConfig.java rename to vboot-core/src/main/java/vboot/core/config/web/RestTemplateConfig.java index 9001afb..be9d58c 100644 --- a/vboot-core/src/main/java/vboot/config/web/RestTemplateConfig.java +++ b/vboot-core/src/main/java/vboot/core/config/web/RestTemplateConfig.java @@ -1,4 +1,4 @@ -package vboot.config.web; +package vboot.core.config.web; import org.apache.http.client.HttpClient; import org.apache.http.client.config.RequestConfig; diff --git a/vboot-core/src/main/java/vboot/config/web/WebSocketConfig.java b/vboot-core/src/main/java/vboot/core/config/web/WebSocketConfig.java similarity index 93% rename from vboot-core/src/main/java/vboot/config/web/WebSocketConfig.java rename to vboot-core/src/main/java/vboot/core/config/web/WebSocketConfig.java index 6e47cf4..c57b561 100644 --- a/vboot-core/src/main/java/vboot/config/web/WebSocketConfig.java +++ b/vboot-core/src/main/java/vboot/core/config/web/WebSocketConfig.java @@ -1,4 +1,4 @@ -package vboot.config.web; +package vboot.core.config.web; import org.springframework.context.annotation.Configuration; diff --git a/vboot-core/src/main/java/vboot/config/web/WebSocketServer.java b/vboot-core/src/main/java/vboot/core/config/web/WebSocketServer.java similarity index 98% rename from vboot-core/src/main/java/vboot/config/web/WebSocketServer.java rename to vboot-core/src/main/java/vboot/core/config/web/WebSocketServer.java index 81a7753..e65f8c9 100644 --- a/vboot-core/src/main/java/vboot/config/web/WebSocketServer.java +++ b/vboot-core/src/main/java/vboot/core/config/web/WebSocketServer.java @@ -1,4 +1,4 @@ -package vboot.config.web; +package vboot.core.config.web; import org.springframework.stereotype.Component; diff --git a/vboot-core/src/main/java/vboot/module/ass/dict/cate/AssDictCate.java b/vboot-core/src/main/java/vboot/core/module/ass/dict/cate/AssDictCate.java similarity index 68% rename from vboot-core/src/main/java/vboot/module/ass/dict/cate/AssDictCate.java rename to vboot-core/src/main/java/vboot/core/module/ass/dict/cate/AssDictCate.java index e1a0c81..8c7ddd2 100644 --- a/vboot-core/src/main/java/vboot/module/ass/dict/cate/AssDictCate.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/dict/cate/AssDictCate.java @@ -1,8 +1,8 @@ -package vboot.module.ass.dict.cate; +package vboot.core.module.ass.dict.cate; import lombok.Getter; import lombok.Setter; -import vboot.common.mvc.entity.BaseCateEntity; +import vboot.core.common.entity.BaseCateEntity; import javax.persistence.Entity; diff --git a/vboot-core/src/main/java/vboot/module/ass/dict/cate/AssDictCateApi.java b/vboot-core/src/main/java/vboot/core/module/ass/dict/cate/AssDictCateApi.java similarity index 90% rename from vboot-core/src/main/java/vboot/module/ass/dict/cate/AssDictCateApi.java rename to vboot-core/src/main/java/vboot/core/module/ass/dict/cate/AssDictCateApi.java index 6715eec..014536a 100644 --- a/vboot-core/src/main/java/vboot/module/ass/dict/cate/AssDictCateApi.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/dict/cate/AssDictCateApi.java @@ -1,7 +1,7 @@ -package vboot.module.ass.dict.cate; +package vboot.core.module.ass.dict.cate; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-core/src/main/java/vboot/module/ass/dict/cate/AssDictCateRepo.java b/vboot-core/src/main/java/vboot/core/module/ass/dict/cate/AssDictCateRepo.java similarity index 77% rename from vboot-core/src/main/java/vboot/module/ass/dict/cate/AssDictCateRepo.java rename to vboot-core/src/main/java/vboot/core/module/ass/dict/cate/AssDictCateRepo.java index 80d820d..0957b61 100644 --- a/vboot-core/src/main/java/vboot/module/ass/dict/cate/AssDictCateRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/dict/cate/AssDictCateRepo.java @@ -1,4 +1,4 @@ -package vboot.module.ass.dict.cate; +package vboot.core.module.ass.dict.cate; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/ass/dict/cate/AssDictCateService.java b/vboot-core/src/main/java/vboot/core/module/ass/dict/cate/AssDictCateService.java similarity index 81% rename from vboot-core/src/main/java/vboot/module/ass/dict/cate/AssDictCateService.java rename to vboot-core/src/main/java/vboot/core/module/ass/dict/cate/AssDictCateService.java index 6977715..b4e18af 100644 --- a/vboot-core/src/main/java/vboot/module/ass/dict/cate/AssDictCateService.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/dict/cate/AssDictCateService.java @@ -1,6 +1,6 @@ -package vboot.module.ass.dict.cate; +package vboot.core.module.ass.dict.cate; -import vboot.common.mvc.service.BaseCateService; +import vboot.core.common.service.BaseCateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-core/src/main/java/vboot/module/ass/dict/data/AssDictData.java b/vboot-core/src/main/java/vboot/core/module/ass/dict/data/AssDictData.java similarity index 78% rename from vboot-core/src/main/java/vboot/module/ass/dict/data/AssDictData.java rename to vboot-core/src/main/java/vboot/core/module/ass/dict/data/AssDictData.java index 05320a5..939d81e 100644 --- a/vboot-core/src/main/java/vboot/module/ass/dict/data/AssDictData.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/dict/data/AssDictData.java @@ -1,8 +1,8 @@ -package vboot.module.ass.dict.data; +package vboot.core.module.ass.dict.data; import lombok.Getter; import lombok.Setter; -import vboot.common.mvc.entity.BaseEntity; +import vboot.core.common.entity.BaseEntity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/vboot-core/src/main/java/vboot/module/ass/dict/data/AssDictDataApi.java b/vboot-core/src/main/java/vboot/core/module/ass/dict/data/AssDictDataApi.java similarity index 90% rename from vboot-core/src/main/java/vboot/module/ass/dict/data/AssDictDataApi.java rename to vboot-core/src/main/java/vboot/core/module/ass/dict/data/AssDictDataApi.java index 1ef6456..c59a863 100644 --- a/vboot-core/src/main/java/vboot/module/ass/dict/data/AssDictDataApi.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/dict/data/AssDictDataApi.java @@ -1,7 +1,7 @@ -package vboot.module.ass.dict.data; +package vboot.core.module.ass.dict.data; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-core/src/main/java/vboot/module/ass/dict/data/AssDictDataRepo.java b/vboot-core/src/main/java/vboot/core/module/ass/dict/data/AssDictDataRepo.java similarity index 78% rename from vboot-core/src/main/java/vboot/module/ass/dict/data/AssDictDataRepo.java rename to vboot-core/src/main/java/vboot/core/module/ass/dict/data/AssDictDataRepo.java index 9dc4988..0018092 100644 --- a/vboot-core/src/main/java/vboot/module/ass/dict/data/AssDictDataRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/dict/data/AssDictDataRepo.java @@ -1,4 +1,4 @@ -package vboot.module.ass.dict.data; +package vboot.core.module.ass.dict.data; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/ass/dict/data/AssDictDataService.java b/vboot-core/src/main/java/vboot/core/module/ass/dict/data/AssDictDataService.java similarity index 82% rename from vboot-core/src/main/java/vboot/module/ass/dict/data/AssDictDataService.java rename to vboot-core/src/main/java/vboot/core/module/ass/dict/data/AssDictDataService.java index e971f7d..bf831e2 100644 --- a/vboot-core/src/main/java/vboot/module/ass/dict/data/AssDictDataService.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/dict/data/AssDictDataService.java @@ -1,6 +1,6 @@ -package vboot.module.ass.dict.data; +package vboot.core.module.ass.dict.data; -import vboot.common.mvc.service.BaseService; +import vboot.core.common.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-core/src/main/java/vboot/module/ass/dict/main/AssDictMain.java b/vboot-core/src/main/java/vboot/core/module/ass/dict/main/AssDictMain.java similarity index 77% rename from vboot-core/src/main/java/vboot/module/ass/dict/main/AssDictMain.java rename to vboot-core/src/main/java/vboot/core/module/ass/dict/main/AssDictMain.java index 0717c4a..634126a 100644 --- a/vboot-core/src/main/java/vboot/module/ass/dict/main/AssDictMain.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/dict/main/AssDictMain.java @@ -1,8 +1,8 @@ -package vboot.module.ass.dict.main; +package vboot.core.module.ass.dict.main; import lombok.Getter; import lombok.Setter; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/vboot-core/src/main/java/vboot/module/ass/dict/main/AssDictMainApi.java b/vboot-core/src/main/java/vboot/core/module/ass/dict/main/AssDictMainApi.java similarity index 91% rename from vboot-core/src/main/java/vboot/module/ass/dict/main/AssDictMainApi.java rename to vboot-core/src/main/java/vboot/core/module/ass/dict/main/AssDictMainApi.java index 5902497..3b0114d 100644 --- a/vboot-core/src/main/java/vboot/module/ass/dict/main/AssDictMainApi.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/dict/main/AssDictMainApi.java @@ -1,7 +1,7 @@ -package vboot.module.ass.dict.main; +package vboot.core.module.ass.dict.main; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.dom4j.DocumentException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-core/src/main/java/vboot/module/ass/dict/main/AssDictMainRepo.java b/vboot-core/src/main/java/vboot/core/module/ass/dict/main/AssDictMainRepo.java similarity index 78% rename from vboot-core/src/main/java/vboot/module/ass/dict/main/AssDictMainRepo.java rename to vboot-core/src/main/java/vboot/core/module/ass/dict/main/AssDictMainRepo.java index 3101b7c..99c8c56 100644 --- a/vboot-core/src/main/java/vboot/module/ass/dict/main/AssDictMainRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/dict/main/AssDictMainRepo.java @@ -1,4 +1,4 @@ -package vboot.module.ass.dict.main; +package vboot.core.module.ass.dict.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/ass/dict/main/AssDictMainService.java b/vboot-core/src/main/java/vboot/core/module/ass/dict/main/AssDictMainService.java similarity index 82% rename from vboot-core/src/main/java/vboot/module/ass/dict/main/AssDictMainService.java rename to vboot-core/src/main/java/vboot/core/module/ass/dict/main/AssDictMainService.java index d68d390..334ecb8 100644 --- a/vboot-core/src/main/java/vboot/module/ass/dict/main/AssDictMainService.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/dict/main/AssDictMainService.java @@ -1,6 +1,6 @@ -package vboot.module.ass.dict.main; +package vboot.core.module.ass.dict.main; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-core/src/main/java/vboot/module/ass/file/att/AssFileAtt.java b/vboot-core/src/main/java/vboot/core/module/ass/file/att/AssFileAtt.java similarity index 92% rename from vboot-core/src/main/java/vboot/module/ass/file/att/AssFileAtt.java rename to vboot-core/src/main/java/vboot/core/module/ass/file/att/AssFileAtt.java index b75c835..7ae5211 100644 --- a/vboot-core/src/main/java/vboot/module/ass/file/att/AssFileAtt.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/file/att/AssFileAtt.java @@ -1,4 +1,4 @@ -package vboot.module.ass.file.att; +package vboot.core.module.ass.file.att; import lombok.Data; diff --git a/vboot-core/src/main/java/vboot/module/ass/file/att/AssFileAttHandler.java b/vboot-core/src/main/java/vboot/core/module/ass/file/att/AssFileAttHandler.java similarity index 98% rename from vboot-core/src/main/java/vboot/module/ass/file/att/AssFileAttHandler.java rename to vboot-core/src/main/java/vboot/core/module/ass/file/att/AssFileAttHandler.java index 1d5c746..48cdb6b 100644 --- a/vboot-core/src/main/java/vboot/module/ass/file/att/AssFileAttHandler.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/file/att/AssFileAttHandler.java @@ -1,8 +1,8 @@ -package vboot.module.ass.file.att; +package vboot.core.module.ass.file.att; -import vboot.common.util.file.XfileUtil; -import vboot.common.util.lang.XdateUtil; -import vboot.common.util.lang.XstringUtil; +import vboot.core.xutil.file.XfileUtil; +import vboot.core.xutil.lang.XdateUtil; +import vboot.core.xutil.lang.XstringUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; diff --git a/vboot-core/src/main/java/vboot/module/ass/file/att/AssFileAttRepo.java b/vboot-core/src/main/java/vboot/core/module/ass/file/att/AssFileAttRepo.java similarity index 78% rename from vboot-core/src/main/java/vboot/module/ass/file/att/AssFileAttRepo.java rename to vboot-core/src/main/java/vboot/core/module/ass/file/att/AssFileAttRepo.java index 24d1bcb..6b4f3be 100644 --- a/vboot-core/src/main/java/vboot/module/ass/file/att/AssFileAttRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/file/att/AssFileAttRepo.java @@ -1,4 +1,4 @@ -package vboot.module.ass.file.att; +package vboot.core.module.ass.file.att; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/ass/num/main/AssNumMain.java b/vboot-core/src/main/java/vboot/core/module/ass/num/main/AssNumMain.java similarity index 93% rename from vboot-core/src/main/java/vboot/module/ass/num/main/AssNumMain.java rename to vboot-core/src/main/java/vboot/core/module/ass/num/main/AssNumMain.java index 0c2230f..1f600dc 100644 --- a/vboot-core/src/main/java/vboot/module/ass/num/main/AssNumMain.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/num/main/AssNumMain.java @@ -1,4 +1,4 @@ -package vboot.module.ass.num.main; +package vboot.core.module.ass.num.main; import lombok.Data; diff --git a/vboot-core/src/main/java/vboot/module/ass/num/main/AssNumMainApi.java b/vboot-core/src/main/java/vboot/core/module/ass/num/main/AssNumMainApi.java similarity index 90% rename from vboot-core/src/main/java/vboot/module/ass/num/main/AssNumMainApi.java rename to vboot-core/src/main/java/vboot/core/module/ass/num/main/AssNumMainApi.java index 733b48d..244a028 100644 --- a/vboot-core/src/main/java/vboot/module/ass/num/main/AssNumMainApi.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/num/main/AssNumMainApi.java @@ -1,8 +1,8 @@ -package vboot.module.ass.num.main; +package vboot.core.module.ass.num.main; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; -import vboot.common.util.lang.XstringUtil; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; +import vboot.core.xutil.lang.XstringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-core/src/main/java/vboot/module/ass/num/main/AssNumMainRepo.java b/vboot-core/src/main/java/vboot/core/module/ass/num/main/AssNumMainRepo.java similarity index 78% rename from vboot-core/src/main/java/vboot/module/ass/num/main/AssNumMainRepo.java rename to vboot-core/src/main/java/vboot/core/module/ass/num/main/AssNumMainRepo.java index 710fae6..60c6ecb 100644 --- a/vboot-core/src/main/java/vboot/module/ass/num/main/AssNumMainRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/num/main/AssNumMainRepo.java @@ -1,4 +1,4 @@ -package vboot.module.ass.num.main; +package vboot.core.module.ass.num.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/ass/num/main/AssNumMainService.java b/vboot-core/src/main/java/vboot/core/module/ass/num/main/AssNumMainService.java similarity index 96% rename from vboot-core/src/main/java/vboot/module/ass/num/main/AssNumMainService.java rename to vboot-core/src/main/java/vboot/core/module/ass/num/main/AssNumMainService.java index 3083ee0..7a6ab15 100644 --- a/vboot-core/src/main/java/vboot/module/ass/num/main/AssNumMainService.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/num/main/AssNumMainService.java @@ -1,9 +1,9 @@ -package vboot.module.ass.num.main; +package vboot.core.module.ass.num.main; -import vboot.common.mvc.api.PageData; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.util.lang.XstringUtil; +import vboot.core.common.api.PageData; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.xutil.lang.XstringUtil; import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-core/src/main/java/vboot/module/ass/num/main/NumUtil.java b/vboot-core/src/main/java/vboot/core/module/ass/num/main/NumUtil.java similarity index 95% rename from vboot-core/src/main/java/vboot/module/ass/num/main/NumUtil.java rename to vboot-core/src/main/java/vboot/core/module/ass/num/main/NumUtil.java index 08edebb..fd12496 100644 --- a/vboot-core/src/main/java/vboot/module/ass/num/main/NumUtil.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/num/main/NumUtil.java @@ -1,7 +1,7 @@ -package vboot.module.ass.num.main; +package vboot.core.module.ass.num.main; -import vboot.common.util.lang.XdateUtil; +import vboot.core.xutil.lang.XdateUtil; public class NumUtil { // 利用给定的流水位生成第一个流水号 diff --git a/vboot-core/src/main/java/vboot/module/bpm/audit/main/BpmAuditMain.java b/vboot-core/src/main/java/vboot/core/module/bpm/audit/main/BpmAuditMain.java similarity index 96% rename from vboot-core/src/main/java/vboot/module/bpm/audit/main/BpmAuditMain.java rename to vboot-core/src/main/java/vboot/core/module/bpm/audit/main/BpmAuditMain.java index 2b7a4e8..8711310 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/audit/main/BpmAuditMain.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/audit/main/BpmAuditMain.java @@ -1,4 +1,4 @@ -package vboot.module.bpm.audit.main; +package vboot.core.module.bpm.audit.main; import lombok.Getter; import lombok.Setter; diff --git a/vboot-core/src/main/java/vboot/module/bpm/audit/main/BpmAuditMainApi.java b/vboot-core/src/main/java/vboot/core/module/bpm/audit/main/BpmAuditMainApi.java similarity index 85% rename from vboot-core/src/main/java/vboot/module/bpm/audit/main/BpmAuditMainApi.java rename to vboot-core/src/main/java/vboot/core/module/bpm/audit/main/BpmAuditMainApi.java index 2eec864..0f8e3cf 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/audit/main/BpmAuditMainApi.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/audit/main/BpmAuditMainApi.java @@ -1,7 +1,7 @@ -package vboot.module.bpm.audit.main; +package vboot.core.module.bpm.audit.main; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.JdbcDao; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.JdbcDao; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-core/src/main/java/vboot/module/bpm/audit/main/BpmAuditMainRepo.java b/vboot-core/src/main/java/vboot/core/module/bpm/audit/main/BpmAuditMainRepo.java similarity index 77% rename from vboot-core/src/main/java/vboot/module/bpm/audit/main/BpmAuditMainRepo.java rename to vboot-core/src/main/java/vboot/core/module/bpm/audit/main/BpmAuditMainRepo.java index 7f3b6c6..400ae91 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/audit/main/BpmAuditMainRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/audit/main/BpmAuditMainRepo.java @@ -1,4 +1,4 @@ -package vboot.module.bpm.audit.main; +package vboot.core.module.bpm.audit.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/bpm/audit/main/BpmAuditMainService.java b/vboot-core/src/main/java/vboot/core/module/bpm/audit/main/BpmAuditMainService.java similarity index 90% rename from vboot-core/src/main/java/vboot/module/bpm/audit/main/BpmAuditMainService.java rename to vboot-core/src/main/java/vboot/core/module/bpm/audit/main/BpmAuditMainService.java index f14d294..3820f92 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/audit/main/BpmAuditMainService.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/audit/main/BpmAuditMainService.java @@ -1,9 +1,9 @@ -package vboot.module.bpm.audit.main; +package vboot.core.module.bpm.audit.main; -import vboot.module.bpm.proc.main.Zbpm; -import vboot.module.bpm.proc.main.Znode; -import vboot.common.util.lang.XstringUtil; +import vboot.core.module.bpm.proc.main.Zbpm; +import vboot.core.module.bpm.proc.main.Znode; +import vboot.core.xutil.lang.XstringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/vboot-core/src/main/java/vboot/module/bpm/node/hist/BpmNodeHist.java b/vboot-core/src/main/java/vboot/core/module/bpm/node/hist/BpmNodeHist.java similarity index 95% rename from vboot-core/src/main/java/vboot/module/bpm/node/hist/BpmNodeHist.java rename to vboot-core/src/main/java/vboot/core/module/bpm/node/hist/BpmNodeHist.java index 9a918be..cc6d11c 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/node/hist/BpmNodeHist.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/node/hist/BpmNodeHist.java @@ -1,4 +1,4 @@ -package vboot.module.bpm.node.hist; +package vboot.core.module.bpm.node.hist; import lombok.Getter; import lombok.Setter; diff --git a/vboot-core/src/main/java/vboot/module/bpm/node/hist/BpmNodeHistRepo.java b/vboot-core/src/main/java/vboot/core/module/bpm/node/hist/BpmNodeHistRepo.java similarity index 77% rename from vboot-core/src/main/java/vboot/module/bpm/node/hist/BpmNodeHistRepo.java rename to vboot-core/src/main/java/vboot/core/module/bpm/node/hist/BpmNodeHistRepo.java index 8ce98b3..ad342a0 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/node/hist/BpmNodeHistRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/node/hist/BpmNodeHistRepo.java @@ -1,4 +1,4 @@ -package vboot.module.bpm.node.hist; +package vboot.core.module.bpm.node.hist; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/bpm/node/hist/BpmNodeHistService.java b/vboot-core/src/main/java/vboot/core/module/bpm/node/hist/BpmNodeHistService.java similarity index 92% rename from vboot-core/src/main/java/vboot/module/bpm/node/hist/BpmNodeHistService.java rename to vboot-core/src/main/java/vboot/core/module/bpm/node/hist/BpmNodeHistService.java index f2e75de..31dffdb 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/node/hist/BpmNodeHistService.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/node/hist/BpmNodeHistService.java @@ -1,9 +1,9 @@ -package vboot.module.bpm.node.hist; +package vboot.core.module.bpm.node.hist; -import vboot.common.util.lang.XstringUtil; -import vboot.module.bpm.node.main.BpmNodeMain; -import vboot.module.bpm.proc.main.Zbpm; -import vboot.module.bpm.proc.main.Znode; +import vboot.core.xutil.lang.XstringUtil; +import vboot.core.module.bpm.node.main.BpmNodeMain; +import vboot.core.module.bpm.proc.main.Zbpm; +import vboot.core.module.bpm.proc.main.Znode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/vboot-core/src/main/java/vboot/module/bpm/node/main/BpmNodeMain.java b/vboot-core/src/main/java/vboot/core/module/bpm/node/main/BpmNodeMain.java similarity index 94% rename from vboot-core/src/main/java/vboot/module/bpm/node/main/BpmNodeMain.java rename to vboot-core/src/main/java/vboot/core/module/bpm/node/main/BpmNodeMain.java index 0798ec9..e53ba0c 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/node/main/BpmNodeMain.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/node/main/BpmNodeMain.java @@ -1,4 +1,4 @@ -package vboot.module.bpm.node.main; +package vboot.core.module.bpm.node.main; import lombok.Getter; import lombok.Setter; diff --git a/vboot-core/src/main/java/vboot/module/bpm/node/main/BpmNodeMainRepo.java b/vboot-core/src/main/java/vboot/core/module/bpm/node/main/BpmNodeMainRepo.java similarity index 77% rename from vboot-core/src/main/java/vboot/module/bpm/node/main/BpmNodeMainRepo.java rename to vboot-core/src/main/java/vboot/core/module/bpm/node/main/BpmNodeMainRepo.java index f94efaa..b1a01aa 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/node/main/BpmNodeMainRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/node/main/BpmNodeMainRepo.java @@ -1,4 +1,4 @@ -package vboot.module.bpm.node.main; +package vboot.core.module.bpm.node.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/bpm/node/main/BpmNodeMainService.java b/vboot-core/src/main/java/vboot/core/module/bpm/node/main/BpmNodeMainService.java similarity index 83% rename from vboot-core/src/main/java/vboot/module/bpm/node/main/BpmNodeMainService.java rename to vboot-core/src/main/java/vboot/core/module/bpm/node/main/BpmNodeMainService.java index 1bc5f06..461ef7f 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/node/main/BpmNodeMainService.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/node/main/BpmNodeMainService.java @@ -1,9 +1,9 @@ -package vboot.module.bpm.node.main; +package vboot.core.module.bpm.node.main; -import vboot.common.util.lang.XstringUtil; -import vboot.module.bpm.proc.main.Zbpm; -import vboot.module.bpm.proc.main.Znode; +import vboot.core.xutil.lang.XstringUtil; +import vboot.core.module.bpm.proc.main.Zbpm; +import vboot.core.module.bpm.proc.main.Znode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/vboot-core/src/main/java/vboot/module/bpm/proc/main/BpmProcMain.java b/vboot-core/src/main/java/vboot/core/module/bpm/proc/main/BpmProcMain.java similarity index 82% rename from vboot-core/src/main/java/vboot/module/bpm/proc/main/BpmProcMain.java rename to vboot-core/src/main/java/vboot/core/module/bpm/proc/main/BpmProcMain.java index 6f54ce2..dd70488 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/proc/main/BpmProcMain.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/proc/main/BpmProcMain.java @@ -1,7 +1,7 @@ -package vboot.module.bpm.proc.main; +package vboot.core.module.bpm.proc.main; -import vboot.common.mvc.entity.BaseMainEntity; -import vboot.module.sys.org.root.SysOrg; +import vboot.core.common.entity.BaseMainEntity; +import vboot.core.module.sys.org.root.SysOrg; import lombok.Getter; import lombok.Setter; diff --git a/vboot-core/src/main/java/vboot/module/bpm/proc/main/BpmProcMainApi.java b/vboot-core/src/main/java/vboot/core/module/bpm/proc/main/BpmProcMainApi.java similarity index 96% rename from vboot-core/src/main/java/vboot/module/bpm/proc/main/BpmProcMainApi.java rename to vboot-core/src/main/java/vboot/core/module/bpm/proc/main/BpmProcMainApi.java index e9c5533..e855d35 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/proc/main/BpmProcMainApi.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/proc/main/BpmProcMainApi.java @@ -1,11 +1,11 @@ -package vboot.module.bpm.proc.main; +package vboot.core.module.bpm.proc.main; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.pojo.Zinp; -import vboot.common.util.lang.XstringUtil; -import vboot.common.util.web.XuserUtil; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.common.pojo.Zinp; +import vboot.core.xutil.lang.XstringUtil; +import vboot.core.xutil.web.XuserUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-core/src/main/java/vboot/module/bpm/proc/main/BpmProcMainHand.java b/vboot-core/src/main/java/vboot/core/module/bpm/proc/main/BpmProcMainHand.java similarity index 99% rename from vboot-core/src/main/java/vboot/module/bpm/proc/main/BpmProcMainHand.java rename to vboot-core/src/main/java/vboot/core/module/bpm/proc/main/BpmProcMainHand.java index fe79e91..cb8ed66 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/proc/main/BpmProcMainHand.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/proc/main/BpmProcMainHand.java @@ -1,12 +1,11 @@ -package vboot.module.bpm.proc.main; +package vboot.core.module.bpm.proc.main; import org.dom4j.Document; import org.dom4j.DocumentException; import org.dom4j.Element; import org.dom4j.io.SAXReader; -import org.hibernate.internal.util.xml.XmlDocument; import org.springframework.stereotype.Component; -import vboot.common.mvc.pojo.Zinp; +import vboot.core.common.pojo.Zinp; import java.io.Reader; import java.io.StringReader; diff --git a/vboot-core/src/main/java/vboot/module/bpm/proc/main/BpmProcMainRepo.java b/vboot-core/src/main/java/vboot/core/module/bpm/proc/main/BpmProcMainRepo.java similarity index 77% rename from vboot-core/src/main/java/vboot/module/bpm/proc/main/BpmProcMainRepo.java rename to vboot-core/src/main/java/vboot/core/module/bpm/proc/main/BpmProcMainRepo.java index 0e2bd83..d7fe2e4 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/proc/main/BpmProcMainRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/proc/main/BpmProcMainRepo.java @@ -1,4 +1,4 @@ -package vboot.module.bpm.proc.main; +package vboot.core.module.bpm.proc.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/bpm/proc/main/BpmProcMainService.java b/vboot-core/src/main/java/vboot/core/module/bpm/proc/main/BpmProcMainService.java similarity index 92% rename from vboot-core/src/main/java/vboot/module/bpm/proc/main/BpmProcMainService.java rename to vboot-core/src/main/java/vboot/core/module/bpm/proc/main/BpmProcMainService.java index c8fbc94..824fca5 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/proc/main/BpmProcMainService.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/proc/main/BpmProcMainService.java @@ -1,20 +1,20 @@ -package vboot.module.bpm.proc.main; +package vboot.core.module.bpm.proc.main; -import vboot.common.mvc.service.BaseMainService; -import vboot.common.util.lang.XstringUtil; -import vboot.common.util.web.XuserUtil; -import vboot.module.bpm.audit.main.BpmAuditMainService; -import vboot.module.bpm.node.hist.BpmNodeHist; -import vboot.module.bpm.node.hist.BpmNodeHistService; -import vboot.module.bpm.node.main.BpmNodeMain; -import vboot.module.bpm.node.main.BpmNodeMainService; -import vboot.module.bpm.proc.param.BpmProcParam; -import vboot.module.bpm.proc.param.BpmProcParamService; -import vboot.module.bpm.task.hist.BpmTaskHist; -import vboot.module.bpm.task.hist.BpmTaskHistService; -import vboot.module.bpm.task.main.BpmTaskMain; -import vboot.module.bpm.task.main.BpmTaskMainService; -import vboot.module.sys.todo.main.SysTodoMainService; +import vboot.core.common.service.BaseMainService; +import vboot.core.xutil.lang.XstringUtil; +import vboot.core.xutil.web.XuserUtil; +import vboot.core.module.bpm.audit.main.BpmAuditMainService; +import vboot.core.module.bpm.node.hist.BpmNodeHist; +import vboot.core.module.bpm.node.hist.BpmNodeHistService; +import vboot.core.module.bpm.node.main.BpmNodeMain; +import vboot.core.module.bpm.node.main.BpmNodeMainService; +import vboot.core.module.bpm.proc.param.BpmProcParam; +import vboot.core.module.bpm.proc.param.BpmProcParamService; +import vboot.core.module.bpm.task.hist.BpmTaskHist; +import vboot.core.module.bpm.task.hist.BpmTaskHistService; +import vboot.core.module.bpm.task.main.BpmTaskMain; +import vboot.core.module.bpm.task.main.BpmTaskMainService; +import vboot.core.module.sys.todo.main.SysTodoMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.stereotype.Service; diff --git a/vboot-core/src/main/java/vboot/module/bpm/proc/main/Zbpm.java b/vboot-core/src/main/java/vboot/core/module/bpm/proc/main/Zbpm.java similarity index 96% rename from vboot-core/src/main/java/vboot/module/bpm/proc/main/Zbpm.java rename to vboot-core/src/main/java/vboot/core/module/bpm/proc/main/Zbpm.java index 3d94c0f..21934fc 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/proc/main/Zbpm.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/proc/main/Zbpm.java @@ -1,4 +1,4 @@ -package vboot.module.bpm.proc.main; +package vboot.core.module.bpm.proc.main; import lombok.Data; diff --git a/vboot-core/src/main/java/vboot/module/bpm/proc/main/Znode.java b/vboot-core/src/main/java/vboot/core/module/bpm/proc/main/Znode.java similarity index 91% rename from vboot-core/src/main/java/vboot/module/bpm/proc/main/Znode.java rename to vboot-core/src/main/java/vboot/core/module/bpm/proc/main/Znode.java index 4264392..0370f70 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/proc/main/Znode.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/proc/main/Znode.java @@ -1,4 +1,4 @@ -package vboot.module.bpm.proc.main; +package vboot.core.module.bpm.proc.main; import lombok.Data; diff --git a/vboot-core/src/main/java/vboot/module/bpm/proc/param/BpmProcParam.java b/vboot-core/src/main/java/vboot/core/module/bpm/proc/param/BpmProcParam.java similarity index 92% rename from vboot-core/src/main/java/vboot/module/bpm/proc/param/BpmProcParam.java rename to vboot-core/src/main/java/vboot/core/module/bpm/proc/param/BpmProcParam.java index 0a7823d..d3ba781 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/proc/param/BpmProcParam.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/proc/param/BpmProcParam.java @@ -1,4 +1,4 @@ -package vboot.module.bpm.proc.param; +package vboot.core.module.bpm.proc.param; import lombok.Getter; import lombok.Setter; diff --git a/vboot-core/src/main/java/vboot/module/bpm/proc/param/BpmProcParamRepo.java b/vboot-core/src/main/java/vboot/core/module/bpm/proc/param/BpmProcParamRepo.java similarity index 77% rename from vboot-core/src/main/java/vboot/module/bpm/proc/param/BpmProcParamRepo.java rename to vboot-core/src/main/java/vboot/core/module/bpm/proc/param/BpmProcParamRepo.java index 5129c5b..6ab2af4 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/proc/param/BpmProcParamRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/proc/param/BpmProcParamRepo.java @@ -1,4 +1,4 @@ -package vboot.module.bpm.proc.param; +package vboot.core.module.bpm.proc.param; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/bpm/proc/param/BpmProcParamService.java b/vboot-core/src/main/java/vboot/core/module/bpm/proc/param/BpmProcParamService.java similarity index 91% rename from vboot-core/src/main/java/vboot/module/bpm/proc/param/BpmProcParamService.java rename to vboot-core/src/main/java/vboot/core/module/bpm/proc/param/BpmProcParamService.java index f682ee2..9686416 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/proc/param/BpmProcParamService.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/proc/param/BpmProcParamService.java @@ -1,4 +1,4 @@ -package vboot.module.bpm.proc.param; +package vboot.core.module.bpm.proc.param; import org.springframework.beans.factory.annotation.Autowired; diff --git a/vboot-core/src/main/java/vboot/module/bpm/proc/temp/BpmProcTemp.java b/vboot-core/src/main/java/vboot/core/module/bpm/proc/temp/BpmProcTemp.java similarity index 84% rename from vboot-core/src/main/java/vboot/module/bpm/proc/temp/BpmProcTemp.java rename to vboot-core/src/main/java/vboot/core/module/bpm/proc/temp/BpmProcTemp.java index e47b69b..fecc04d 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/proc/temp/BpmProcTemp.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/proc/temp/BpmProcTemp.java @@ -1,6 +1,6 @@ -package vboot.module.bpm.proc.temp; +package vboot.core.module.bpm.proc.temp; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-core/src/main/java/vboot/module/bpm/proc/temp/BpmProcTempRepo.java b/vboot-core/src/main/java/vboot/core/module/bpm/proc/temp/BpmProcTempRepo.java similarity index 78% rename from vboot-core/src/main/java/vboot/module/bpm/proc/temp/BpmProcTempRepo.java rename to vboot-core/src/main/java/vboot/core/module/bpm/proc/temp/BpmProcTempRepo.java index a5e9de6..9f8c018 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/proc/temp/BpmProcTempRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/proc/temp/BpmProcTempRepo.java @@ -1,4 +1,4 @@ -package vboot.module.bpm.proc.temp; +package vboot.core.module.bpm.proc.temp; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/bpm/proc/temp/BpmProcTempService.java b/vboot-core/src/main/java/vboot/core/module/bpm/proc/temp/BpmProcTempService.java similarity index 81% rename from vboot-core/src/main/java/vboot/module/bpm/proc/temp/BpmProcTempService.java rename to vboot-core/src/main/java/vboot/core/module/bpm/proc/temp/BpmProcTempService.java index 32deb1d..507707c 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/proc/temp/BpmProcTempService.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/proc/temp/BpmProcTempService.java @@ -1,6 +1,6 @@ -package vboot.module.bpm.proc.temp; +package vboot.core.module.bpm.proc.temp; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-core/src/main/java/vboot/module/bpm/task/hist/BpmTaskHist.java b/vboot-core/src/main/java/vboot/core/module/bpm/task/hist/BpmTaskHist.java similarity index 95% rename from vboot-core/src/main/java/vboot/module/bpm/task/hist/BpmTaskHist.java rename to vboot-core/src/main/java/vboot/core/module/bpm/task/hist/BpmTaskHist.java index 692a821..32a22de 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/task/hist/BpmTaskHist.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/task/hist/BpmTaskHist.java @@ -1,4 +1,4 @@ -package vboot.module.bpm.task.hist; +package vboot.core.module.bpm.task.hist; import lombok.Getter; import lombok.Setter; diff --git a/vboot-core/src/main/java/vboot/module/bpm/task/hist/BpmTaskHistRepo.java b/vboot-core/src/main/java/vboot/core/module/bpm/task/hist/BpmTaskHistRepo.java similarity index 77% rename from vboot-core/src/main/java/vboot/module/bpm/task/hist/BpmTaskHistRepo.java rename to vboot-core/src/main/java/vboot/core/module/bpm/task/hist/BpmTaskHistRepo.java index 53d2beb..b8b4b38 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/task/hist/BpmTaskHistRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/task/hist/BpmTaskHistRepo.java @@ -1,4 +1,4 @@ -package vboot.module.bpm.task.hist; +package vboot.core.module.bpm.task.hist; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/bpm/task/hist/BpmTaskHistService.java b/vboot-core/src/main/java/vboot/core/module/bpm/task/hist/BpmTaskHistService.java similarity index 88% rename from vboot-core/src/main/java/vboot/module/bpm/task/hist/BpmTaskHistService.java rename to vboot-core/src/main/java/vboot/core/module/bpm/task/hist/BpmTaskHistService.java index d6d4b25..6936961 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/task/hist/BpmTaskHistService.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/task/hist/BpmTaskHistService.java @@ -1,8 +1,8 @@ -package vboot.module.bpm.task.hist; +package vboot.core.module.bpm.task.hist; -import vboot.common.mvc.dao.JdbcDao; -import vboot.module.bpm.task.main.BpmTaskMain; +import vboot.core.common.dao.JdbcDao; +import vboot.core.module.bpm.task.main.BpmTaskMain; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/vboot-core/src/main/java/vboot/module/bpm/task/main/BpmTaskMain.java b/vboot-core/src/main/java/vboot/core/module/bpm/task/main/BpmTaskMain.java similarity index 95% rename from vboot-core/src/main/java/vboot/module/bpm/task/main/BpmTaskMain.java rename to vboot-core/src/main/java/vboot/core/module/bpm/task/main/BpmTaskMain.java index bb10d9b..f4d8319 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/task/main/BpmTaskMain.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/task/main/BpmTaskMain.java @@ -1,4 +1,4 @@ -package vboot.module.bpm.task.main; +package vboot.core.module.bpm.task.main; import lombok.Getter; diff --git a/vboot-core/src/main/java/vboot/module/bpm/task/main/BpmTaskMainRepo.java b/vboot-core/src/main/java/vboot/core/module/bpm/task/main/BpmTaskMainRepo.java similarity index 77% rename from vboot-core/src/main/java/vboot/module/bpm/task/main/BpmTaskMainRepo.java rename to vboot-core/src/main/java/vboot/core/module/bpm/task/main/BpmTaskMainRepo.java index d9555c6..531a96a 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/task/main/BpmTaskMainRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/task/main/BpmTaskMainRepo.java @@ -1,4 +1,4 @@ -package vboot.module.bpm.task.main; +package vboot.core.module.bpm.task.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/bpm/task/main/BpmTaskMainService.java b/vboot-core/src/main/java/vboot/core/module/bpm/task/main/BpmTaskMainService.java similarity index 92% rename from vboot-core/src/main/java/vboot/module/bpm/task/main/BpmTaskMainService.java rename to vboot-core/src/main/java/vboot/core/module/bpm/task/main/BpmTaskMainService.java index 371b44d..f1564fd 100644 --- a/vboot-core/src/main/java/vboot/module/bpm/task/main/BpmTaskMainService.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/task/main/BpmTaskMainService.java @@ -1,11 +1,11 @@ -package vboot.module.bpm.task.main; +package vboot.core.module.bpm.task.main; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.pojo.Zinp; -import vboot.module.bpm.proc.main.Zbpm; -import vboot.module.bpm.proc.main.Znode; -import vboot.common.util.lang.XstringUtil; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.pojo.Zinp; +import vboot.core.module.bpm.proc.main.Zbpm; +import vboot.core.module.bpm.proc.main.Znode; +import vboot.core.xutil.lang.XstringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/vboot-core/src/main/java/vboot/module/gen/file/GenAttApi.java b/vboot-core/src/main/java/vboot/core/module/gen/file/GenAttApi.java similarity index 89% rename from vboot-core/src/main/java/vboot/module/gen/file/GenAttApi.java rename to vboot-core/src/main/java/vboot/core/module/gen/file/GenAttApi.java index bb43e65..0d0a6de 100644 --- a/vboot-core/src/main/java/vboot/module/gen/file/GenAttApi.java +++ b/vboot-core/src/main/java/vboot/core/module/gen/file/GenAttApi.java @@ -1,8 +1,8 @@ -package vboot.module.gen.file; +package vboot.core.module.gen.file; -import vboot.module.ass.file.att.AssFileAtt; -import vboot.module.ass.file.att.AssFileAttRepo; -import vboot.module.ass.file.att.AssFileAttHandler; +import vboot.core.module.ass.file.att.AssFileAtt; +import vboot.core.module.ass.file.att.AssFileAttRepo; +import vboot.core.module.ass.file.att.AssFileAttHandler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/vboot-core/src/main/java/vboot/module/gen/file/GenImgApi.java b/vboot-core/src/main/java/vboot/core/module/gen/file/GenImgApi.java similarity index 89% rename from vboot-core/src/main/java/vboot/module/gen/file/GenImgApi.java rename to vboot-core/src/main/java/vboot/core/module/gen/file/GenImgApi.java index 18246d6..8548956 100644 --- a/vboot-core/src/main/java/vboot/module/gen/file/GenImgApi.java +++ b/vboot-core/src/main/java/vboot/core/module/gen/file/GenImgApi.java @@ -1,9 +1,9 @@ -package vboot.module.gen.file; +package vboot.core.module.gen.file; -import vboot.common.util.file.XqcodeUtil; -import vboot.module.ass.file.att.AssFileAttHandler; -import vboot.module.ass.file.att.AssFileAtt; -import vboot.module.ass.file.att.AssFileAttRepo; +import vboot.core.xutil.file.XqcodeUtil; +import vboot.core.module.ass.file.att.AssFileAttHandler; +import vboot.core.module.ass.file.att.AssFileAtt; +import vboot.core.module.ass.file.att.AssFileAttRepo; import com.google.zxing.WriterException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; diff --git a/vboot-core/src/main/java/vboot/module/gen/num/GenNumApi.java b/vboot-core/src/main/java/vboot/core/module/gen/num/GenNumApi.java similarity index 75% rename from vboot-core/src/main/java/vboot/module/gen/num/GenNumApi.java rename to vboot-core/src/main/java/vboot/core/module/gen/num/GenNumApi.java index ad95726..a821e7e 100644 --- a/vboot-core/src/main/java/vboot/module/gen/num/GenNumApi.java +++ b/vboot-core/src/main/java/vboot/core/module/gen/num/GenNumApi.java @@ -1,7 +1,7 @@ -package vboot.module.gen.num; +package vboot.core.module.gen.num; -import vboot.common.mvc.api.RestResult; -import vboot.common.util.lang.XstringUtil; +import vboot.core.common.api.RestResult; +import vboot.core.xutil.lang.XstringUtil; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/vboot-core/src/main/java/vboot/module/gen/org/rece/GenOrgReceApi.java b/vboot-core/src/main/java/vboot/core/module/gen/org/rece/GenOrgReceApi.java similarity index 88% rename from vboot-core/src/main/java/vboot/module/gen/org/rece/GenOrgReceApi.java rename to vboot-core/src/main/java/vboot/core/module/gen/org/rece/GenOrgReceApi.java index 583f016..ee60b9a 100644 --- a/vboot-core/src/main/java/vboot/module/gen/org/rece/GenOrgReceApi.java +++ b/vboot-core/src/main/java/vboot/core/module/gen/org/rece/GenOrgReceApi.java @@ -1,10 +1,10 @@ -package vboot.module.gen.org.rece; +package vboot.core.module.gen.org.rece; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.util.web.XuserUtil; -import vboot.module.sys.org.rece.SysOrgRece; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.xutil.web.XuserUtil; +import vboot.core.module.sys.org.rece.SysOrgRece; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-core/src/main/java/vboot/module/gen/org/rece/GenOrgReceService.java b/vboot-core/src/main/java/vboot/core/module/gen/org/rece/GenOrgReceService.java similarity index 87% rename from vboot-core/src/main/java/vboot/module/gen/org/rece/GenOrgReceService.java rename to vboot-core/src/main/java/vboot/core/module/gen/org/rece/GenOrgReceService.java index 257bae1..e4f13ac 100644 --- a/vboot-core/src/main/java/vboot/module/gen/org/rece/GenOrgReceService.java +++ b/vboot-core/src/main/java/vboot/core/module/gen/org/rece/GenOrgReceService.java @@ -1,11 +1,11 @@ -package vboot.module.gen.org.rece; +package vboot.core.module.gen.org.rece; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.util.lang.XstringUtil; -import vboot.common.util.web.XuserUtil; -import vboot.module.sys.org.rece.SysOrgRece; -import vboot.module.sys.org.rece.SysOrgReceRepo; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.xutil.lang.XstringUtil; +import vboot.core.xutil.web.XuserUtil; +import vboot.core.module.sys.org.rece.SysOrgRece; +import vboot.core.module.sys.org.rece.SysOrgReceRepo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.stereotype.Service; diff --git a/vboot-core/src/main/java/vboot/module/gen/org/root/GenOrgDeptApi.java b/vboot-core/src/main/java/vboot/core/module/gen/org/root/GenOrgDeptApi.java similarity index 86% rename from vboot-core/src/main/java/vboot/module/gen/org/root/GenOrgDeptApi.java rename to vboot-core/src/main/java/vboot/core/module/gen/org/root/GenOrgDeptApi.java index 53cb595..6519b21 100644 --- a/vboot-core/src/main/java/vboot/module/gen/org/root/GenOrgDeptApi.java +++ b/vboot-core/src/main/java/vboot/core/module/gen/org/root/GenOrgDeptApi.java @@ -1,9 +1,9 @@ -package vboot.module.gen.org.root; +package vboot.core.module.gen.org.root; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.pojo.Ztree; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.common.pojo.Ztree; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/vboot-core/src/main/java/vboot/module/gen/org/root/GenOrgMainApi.java b/vboot-core/src/main/java/vboot/core/module/gen/org/root/GenOrgMainApi.java similarity index 90% rename from vboot-core/src/main/java/vboot/module/gen/org/root/GenOrgMainApi.java rename to vboot-core/src/main/java/vboot/core/module/gen/org/root/GenOrgMainApi.java index 537e0a4..7990ec7 100644 --- a/vboot-core/src/main/java/vboot/module/gen/org/root/GenOrgMainApi.java +++ b/vboot-core/src/main/java/vboot/core/module/gen/org/root/GenOrgMainApi.java @@ -1,9 +1,9 @@ -package vboot.module.gen.org.root; +package vboot.core.module.gen.org.root; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.util.lang.XstringUtil; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.xutil.lang.XstringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/vboot-core/src/main/java/vboot/module/gen/sys/auth/GenAuthApi.java b/vboot-core/src/main/java/vboot/core/module/gen/sys/auth/GenAuthApi.java similarity index 93% rename from vboot-core/src/main/java/vboot/module/gen/sys/auth/GenAuthApi.java rename to vboot-core/src/main/java/vboot/core/module/gen/sys/auth/GenAuthApi.java index 27a9115..edd87f0 100644 --- a/vboot-core/src/main/java/vboot/module/gen/sys/auth/GenAuthApi.java +++ b/vboot-core/src/main/java/vboot/core/module/gen/sys/auth/GenAuthApi.java @@ -1,8 +1,8 @@ -package vboot.module.gen.sys.auth; +package vboot.core.module.gen.sys.auth; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.JdbcDao; -import vboot.config.security.pojo.Zuser; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.security.pojo.Zuser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-core/src/main/java/vboot/module/gen/sys/org/GenOrgApi.java b/vboot-core/src/main/java/vboot/core/module/gen/sys/org/GenOrgApi.java similarity index 90% rename from vboot-core/src/main/java/vboot/module/gen/sys/org/GenOrgApi.java rename to vboot-core/src/main/java/vboot/core/module/gen/sys/org/GenOrgApi.java index fc117a6..d51dc5d 100644 --- a/vboot-core/src/main/java/vboot/module/gen/sys/org/GenOrgApi.java +++ b/vboot-core/src/main/java/vboot/core/module/gen/sys/org/GenOrgApi.java @@ -1,10 +1,10 @@ -package vboot.module.gen.sys.org; +package vboot.core.module.gen.sys.org; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.util.lang.XstringUtil; -import vboot.config.security.pojo.Zuser; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.xutil.lang.XstringUtil; +import vboot.core.security.pojo.Zuser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/vboot-core/src/main/java/vboot/module/sys/job/log/SysJobLog.java b/vboot-core/src/main/java/vboot/core/module/sys/job/log/SysJobLog.java similarity index 92% rename from vboot-core/src/main/java/vboot/module/sys/job/log/SysJobLog.java rename to vboot-core/src/main/java/vboot/core/module/sys/job/log/SysJobLog.java index 115e350..0eb747c 100644 --- a/vboot-core/src/main/java/vboot/module/sys/job/log/SysJobLog.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/job/log/SysJobLog.java @@ -1,4 +1,4 @@ -package vboot.module.sys.job.log; +package vboot.core.module.sys.job.log; import lombok.Data; diff --git a/vboot-core/src/main/java/vboot/module/sys/job/log/SysJobLogApi.java b/vboot-core/src/main/java/vboot/core/module/sys/job/log/SysJobLogApi.java similarity index 90% rename from vboot-core/src/main/java/vboot/module/sys/job/log/SysJobLogApi.java rename to vboot-core/src/main/java/vboot/core/module/sys/job/log/SysJobLogApi.java index b754e98..9e76ad8 100644 --- a/vboot-core/src/main/java/vboot/module/sys/job/log/SysJobLogApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/job/log/SysJobLogApi.java @@ -1,7 +1,7 @@ -package vboot.module.sys.job.log; +package vboot.core.module.sys.job.log; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-core/src/main/java/vboot/module/sys/job/log/SysJobLogRepo.java b/vboot-core/src/main/java/vboot/core/module/sys/job/log/SysJobLogRepo.java similarity index 78% rename from vboot-core/src/main/java/vboot/module/sys/job/log/SysJobLogRepo.java rename to vboot-core/src/main/java/vboot/core/module/sys/job/log/SysJobLogRepo.java index 0971e2a..2e5c4b5 100644 --- a/vboot-core/src/main/java/vboot/module/sys/job/log/SysJobLogRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/job/log/SysJobLogRepo.java @@ -1,4 +1,4 @@ -package vboot.module.sys.job.log; +package vboot.core.module.sys.job.log; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/sys/job/log/SysJobLogService.java b/vboot-core/src/main/java/vboot/core/module/sys/job/log/SysJobLogService.java similarity index 85% rename from vboot-core/src/main/java/vboot/module/sys/job/log/SysJobLogService.java rename to vboot-core/src/main/java/vboot/core/module/sys/job/log/SysJobLogService.java index 4580ced..df39dbe 100644 --- a/vboot-core/src/main/java/vboot/module/sys/job/log/SysJobLogService.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/job/log/SysJobLogService.java @@ -1,9 +1,9 @@ -package vboot.module.sys.job.log; +package vboot.core.module.sys.job.log; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; import lombok.extern.slf4j.Slf4j; -import vboot.common.mvc.api.PageData; +import vboot.core.common.api.PageData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/vboot-core/src/main/java/vboot/module/sys/job/main/SysJobDemo.java b/vboot-core/src/main/java/vboot/core/module/sys/job/main/SysJobDemo.java similarity index 81% rename from vboot-core/src/main/java/vboot/module/sys/job/main/SysJobDemo.java rename to vboot-core/src/main/java/vboot/core/module/sys/job/main/SysJobDemo.java index 5872d3a..02638ed 100644 --- a/vboot-core/src/main/java/vboot/module/sys/job/main/SysJobDemo.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/job/main/SysJobDemo.java @@ -1,8 +1,8 @@ -package vboot.module.sys.job.main; +package vboot.core.module.sys.job.main; -import vboot.module.sys.job.root.IJob; -import vboot.module.sys.job.root.IJobGroup; -import vboot.common.util.lang.XtimeUtil; +import vboot.core.module.sys.job.root.IJob; +import vboot.core.module.sys.job.root.IJobGroup; +import vboot.core.xutil.lang.XtimeUtil; import org.springframework.stereotype.Component; @IJobGroup diff --git a/vboot-core/src/main/java/vboot/module/sys/job/main/SysJobMain.java b/vboot-core/src/main/java/vboot/core/module/sys/job/main/SysJobMain.java similarity index 95% rename from vboot-core/src/main/java/vboot/module/sys/job/main/SysJobMain.java rename to vboot-core/src/main/java/vboot/core/module/sys/job/main/SysJobMain.java index 0c6bade..ce41008 100644 --- a/vboot-core/src/main/java/vboot/module/sys/job/main/SysJobMain.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/job/main/SysJobMain.java @@ -1,4 +1,4 @@ -package vboot.module.sys.job.main; +package vboot.core.module.sys.job.main; import lombok.Data; diff --git a/vboot-core/src/main/java/vboot/module/sys/job/main/SysJobMainApi.java b/vboot-core/src/main/java/vboot/core/module/sys/job/main/SysJobMainApi.java similarity index 92% rename from vboot-core/src/main/java/vboot/module/sys/job/main/SysJobMainApi.java rename to vboot-core/src/main/java/vboot/core/module/sys/job/main/SysJobMainApi.java index 6fb3edb..1dbd856 100644 --- a/vboot-core/src/main/java/vboot/module/sys/job/main/SysJobMainApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/job/main/SysJobMainApi.java @@ -1,9 +1,9 @@ -package vboot.module.sys.job.main; +package vboot.core.module.sys.job.main; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.module.sys.job.root.SysJobHandler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.module.sys.job.root.SysJobHandler; import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-core/src/main/java/vboot/module/sys/job/main/SysJobMainRepo.java b/vboot-core/src/main/java/vboot/core/module/sys/job/main/SysJobMainRepo.java similarity index 78% rename from vboot-core/src/main/java/vboot/module/sys/job/main/SysJobMainRepo.java rename to vboot-core/src/main/java/vboot/core/module/sys/job/main/SysJobMainRepo.java index d46ff79..db5a29c 100644 --- a/vboot-core/src/main/java/vboot/module/sys/job/main/SysJobMainRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/job/main/SysJobMainRepo.java @@ -1,4 +1,4 @@ -package vboot.module.sys.job.main; +package vboot.core.module.sys.job.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/sys/job/main/SysJobMainService.java b/vboot-core/src/main/java/vboot/core/module/sys/job/main/SysJobMainService.java similarity index 95% rename from vboot-core/src/main/java/vboot/module/sys/job/main/SysJobMainService.java rename to vboot-core/src/main/java/vboot/core/module/sys/job/main/SysJobMainService.java index 754e879..88547a5 100644 --- a/vboot-core/src/main/java/vboot/module/sys/job/main/SysJobMainService.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/job/main/SysJobMainService.java @@ -1,10 +1,10 @@ -package vboot.module.sys.job.main; +package vboot.core.module.sys.job.main; import cn.hutool.core.lang.ClassScanner; -import vboot.common.util.lang.XstringUtil; -import vboot.module.sys.job.root.IJobGroup; +import vboot.core.xutil.lang.XstringUtil; +import vboot.core.module.sys.job.root.IJobGroup; import lombok.extern.slf4j.Slf4j; -import vboot.module.sys.job.root.IJob; +import vboot.core.module.sys.job.root.IJob; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/vboot-core/src/main/java/vboot/module/sys/job/root/IJob.java b/vboot-core/src/main/java/vboot/core/module/sys/job/root/IJob.java similarity index 90% rename from vboot-core/src/main/java/vboot/module/sys/job/root/IJob.java rename to vboot-core/src/main/java/vboot/core/module/sys/job/root/IJob.java index 53b5851..e070195 100644 --- a/vboot-core/src/main/java/vboot/module/sys/job/root/IJob.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/job/root/IJob.java @@ -1,4 +1,4 @@ -package vboot.module.sys.job.root; +package vboot.core.module.sys.job.root; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/vboot-core/src/main/java/vboot/module/sys/job/root/IJobGroup.java b/vboot-core/src/main/java/vboot/core/module/sys/job/root/IJobGroup.java similarity index 86% rename from vboot-core/src/main/java/vboot/module/sys/job/root/IJobGroup.java rename to vboot-core/src/main/java/vboot/core/module/sys/job/root/IJobGroup.java index b3722a7..beb9fdf 100644 --- a/vboot-core/src/main/java/vboot/module/sys/job/root/IJobGroup.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/job/root/IJobGroup.java @@ -1,4 +1,4 @@ -package vboot.module.sys.job.root; +package vboot.core.module.sys.job.root; @java.lang.annotation.Documented @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) diff --git a/vboot-core/src/main/java/vboot/module/sys/job/root/JobConfig.java b/vboot-core/src/main/java/vboot/core/module/sys/job/root/JobConfig.java similarity index 93% rename from vboot-core/src/main/java/vboot/module/sys/job/root/JobConfig.java rename to vboot-core/src/main/java/vboot/core/module/sys/job/root/JobConfig.java index 3878972..661117a 100644 --- a/vboot-core/src/main/java/vboot/module/sys/job/root/JobConfig.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/job/root/JobConfig.java @@ -1,4 +1,4 @@ -package vboot.module.sys.job.root; +package vboot.core.module.sys.job.root; import org.quartz.Scheduler; import org.quartz.SchedulerException; diff --git a/vboot-core/src/main/java/vboot/module/sys/job/root/SysJobFactory.java b/vboot-core/src/main/java/vboot/core/module/sys/job/root/SysJobFactory.java similarity index 84% rename from vboot-core/src/main/java/vboot/module/sys/job/root/SysJobFactory.java rename to vboot-core/src/main/java/vboot/core/module/sys/job/root/SysJobFactory.java index 34951b2..0bbd412 100644 --- a/vboot-core/src/main/java/vboot/module/sys/job/root/SysJobFactory.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/job/root/SysJobFactory.java @@ -1,11 +1,11 @@ -package vboot.module.sys.job.root; +package vboot.core.module.sys.job.root; -import vboot.module.sys.job.log.SysJobLog; -import vboot.module.sys.job.log.SysJobLogRepo; -import vboot.module.sys.job.main.SysJobMain; -import vboot.common.util.lang.XstringUtil; -import vboot.common.util.lang.XtimeUtil; -import vboot.common.util.web.XspringUtil; +import vboot.core.module.sys.job.log.SysJobLog; +import vboot.core.module.sys.job.log.SysJobLogRepo; +import vboot.core.module.sys.job.main.SysJobMain; +import vboot.core.xutil.lang.XstringUtil; +import vboot.core.xutil.lang.XtimeUtil; +import vboot.core.xutil.web.XspringUtil; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.springframework.util.ReflectionUtils; diff --git a/vboot-core/src/main/java/vboot/module/sys/job/root/SysJobHandler.java b/vboot-core/src/main/java/vboot/core/module/sys/job/root/SysJobHandler.java similarity index 97% rename from vboot-core/src/main/java/vboot/module/sys/job/root/SysJobHandler.java rename to vboot-core/src/main/java/vboot/core/module/sys/job/root/SysJobHandler.java index af03d31..2de5295 100644 --- a/vboot-core/src/main/java/vboot/module/sys/job/root/SysJobHandler.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/job/root/SysJobHandler.java @@ -1,8 +1,8 @@ -package vboot.module.sys.job.root; +package vboot.core.module.sys.job.root; -import vboot.module.sys.job.main.SysJobMain; -import vboot.module.sys.job.main.SysJobMainRepo; +import vboot.core.module.sys.job.main.SysJobMain; +import vboot.core.module.sys.job.main.SysJobMainRepo; import org.quartz.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/vboot-core/src/main/java/vboot/module/sys/job/root/SysJobListener.java b/vboot-core/src/main/java/vboot/core/module/sys/job/root/SysJobListener.java similarity index 86% rename from vboot-core/src/main/java/vboot/module/sys/job/root/SysJobListener.java rename to vboot-core/src/main/java/vboot/core/module/sys/job/root/SysJobListener.java index bc173b8..862d825 100644 --- a/vboot-core/src/main/java/vboot/module/sys/job/root/SysJobListener.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/job/root/SysJobListener.java @@ -1,7 +1,7 @@ -package vboot.module.sys.job.root; +package vboot.core.module.sys.job.root; -import vboot.module.sys.job.main.SysJobMain; -import vboot.module.sys.job.main.SysJobMainService; +import vboot.core.module.sys.job.main.SysJobMain; +import vboot.core.module.sys.job.main.SysJobMainService; import lombok.extern.slf4j.Slf4j; import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; diff --git a/vboot-core/src/main/java/vboot/module/sys/log/login/SysLogLogin.java b/vboot-core/src/main/java/vboot/core/module/sys/log/login/SysLogLogin.java similarity index 95% rename from vboot-core/src/main/java/vboot/module/sys/log/login/SysLogLogin.java rename to vboot-core/src/main/java/vboot/core/module/sys/log/login/SysLogLogin.java index 0ca7a2f..93de730 100644 --- a/vboot-core/src/main/java/vboot/module/sys/log/login/SysLogLogin.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/log/login/SysLogLogin.java @@ -1,4 +1,4 @@ -package vboot.module.sys.log.login; +package vboot.core.module.sys.log.login; import lombok.Data; diff --git a/vboot-core/src/main/java/vboot/module/sys/log/login/SysLogLoginApi.java b/vboot-core/src/main/java/vboot/core/module/sys/log/login/SysLogLoginApi.java similarity index 86% rename from vboot-core/src/main/java/vboot/module/sys/log/login/SysLogLoginApi.java rename to vboot-core/src/main/java/vboot/core/module/sys/log/login/SysLogLoginApi.java index 225b5b1..d9c8791 100644 --- a/vboot-core/src/main/java/vboot/module/sys/log/login/SysLogLoginApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/log/login/SysLogLoginApi.java @@ -1,8 +1,8 @@ -package vboot.module.sys.log.login; +package vboot.core.module.sys.log.login; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.common.api.RestResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-core/src/main/java/vboot/module/sys/log/login/SysLogLoginRepo.java b/vboot-core/src/main/java/vboot/core/module/sys/log/login/SysLogLoginRepo.java similarity index 77% rename from vboot-core/src/main/java/vboot/module/sys/log/login/SysLogLoginRepo.java rename to vboot-core/src/main/java/vboot/core/module/sys/log/login/SysLogLoginRepo.java index 63af373..7f59050 100644 --- a/vboot-core/src/main/java/vboot/module/sys/log/login/SysLogLoginRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/log/login/SysLogLoginRepo.java @@ -1,4 +1,4 @@ -package vboot.module.sys.log.login; +package vboot.core.module.sys.log.login; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/sys/log/login/SysLogLoginService.java b/vboot-core/src/main/java/vboot/core/module/sys/log/login/SysLogLoginService.java similarity index 96% rename from vboot-core/src/main/java/vboot/module/sys/log/login/SysLogLoginService.java rename to vboot-core/src/main/java/vboot/core/module/sys/log/login/SysLogLoginService.java index bd98072..b3fbfcb 100644 --- a/vboot-core/src/main/java/vboot/module/sys/log/login/SysLogLoginService.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/log/login/SysLogLoginService.java @@ -1,9 +1,9 @@ -package vboot.module.sys.log.login; +package vboot.core.module.sys.log.login; import cn.hutool.extra.servlet.ServletUtil; -import vboot.common.util.lang.XstringUtil; -import vboot.common.util.web.XaddressUtil; -import vboot.config.security.pojo.Zuser; +import vboot.core.xutil.lang.XstringUtil; +import vboot.core.xutil.web.XaddressUtil; +import vboot.core.security.pojo.Zuser; import eu.bitwalker.useragentutils.Browser; import eu.bitwalker.useragentutils.OperatingSystem; import eu.bitwalker.useragentutils.UserAgent; diff --git a/vboot-core/src/main/java/vboot/module/sys/org/dept/SysOrgDept.java b/vboot-core/src/main/java/vboot/core/module/sys/org/dept/SysOrgDept.java similarity index 94% rename from vboot-core/src/main/java/vboot/module/sys/org/dept/SysOrgDept.java rename to vboot-core/src/main/java/vboot/core/module/sys/org/dept/SysOrgDept.java index 5f4608d..a2b6d80 100644 --- a/vboot-core/src/main/java/vboot/module/sys/org/dept/SysOrgDept.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/dept/SysOrgDept.java @@ -1,6 +1,6 @@ -package vboot.module.sys.org.dept; +package vboot.core.module.sys.org.dept; -import vboot.module.sys.org.root.SysOrg; +import vboot.core.module.sys.org.root.SysOrg; import lombok.Data; import javax.persistence.*; diff --git a/vboot-core/src/main/java/vboot/module/sys/org/dept/SysOrgDeptApi.java b/vboot-core/src/main/java/vboot/core/module/sys/org/dept/SysOrgDeptApi.java similarity index 91% rename from vboot-core/src/main/java/vboot/module/sys/org/dept/SysOrgDeptApi.java rename to vboot-core/src/main/java/vboot/core/module/sys/org/dept/SysOrgDeptApi.java index b4932df..a9a25aa 100644 --- a/vboot-core/src/main/java/vboot/module/sys/org/dept/SysOrgDeptApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/dept/SysOrgDeptApi.java @@ -1,9 +1,9 @@ -package vboot.module.sys.org.dept; +package vboot.core.module.sys.org.dept; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.util.lang.XstringUtil; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.xutil.lang.XstringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-core/src/main/java/vboot/module/sys/org/dept/SysOrgDeptRepo.java b/vboot-core/src/main/java/vboot/core/module/sys/org/dept/SysOrgDeptRepo.java similarity index 88% rename from vboot-core/src/main/java/vboot/module/sys/org/dept/SysOrgDeptRepo.java rename to vboot-core/src/main/java/vboot/core/module/sys/org/dept/SysOrgDeptRepo.java index 3cb4ed1..3855194 100644 --- a/vboot-core/src/main/java/vboot/module/sys/org/dept/SysOrgDeptRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/dept/SysOrgDeptRepo.java @@ -1,4 +1,4 @@ -package vboot.module.sys.org.dept; +package vboot.core.module.sys.org.dept; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/sys/org/dept/SysOrgDeptService.java b/vboot-core/src/main/java/vboot/core/module/sys/org/dept/SysOrgDeptService.java similarity index 96% rename from vboot-core/src/main/java/vboot/module/sys/org/dept/SysOrgDeptService.java rename to vboot-core/src/main/java/vboot/core/module/sys/org/dept/SysOrgDeptService.java index 55a2e79..134970c 100644 --- a/vboot-core/src/main/java/vboot/module/sys/org/dept/SysOrgDeptService.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/dept/SysOrgDeptService.java @@ -1,13 +1,13 @@ -package vboot.module.sys.org.dept; +package vboot.core.module.sys.org.dept; import cn.hutool.core.util.StrUtil; -import vboot.module.sys.org.root.SysOrg; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.pojo.ZidName; -import vboot.common.mvc.api.PageData; -import vboot.common.util.lang.XstringUtil; -import vboot.module.sys.org.root.SysOrgRepo; +import vboot.core.module.sys.org.root.SysOrg; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.common.pojo.ZidName; +import vboot.core.common.api.PageData; +import vboot.core.xutil.lang.XstringUtil; +import vboot.core.module.sys.org.root.SysOrgRepo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.stereotype.Service; diff --git a/vboot-core/src/main/java/vboot/module/sys/org/group/SysOrgGroup.java b/vboot-core/src/main/java/vboot/core/module/sys/org/group/SysOrgGroup.java similarity index 88% rename from vboot-core/src/main/java/vboot/module/sys/org/group/SysOrgGroup.java rename to vboot-core/src/main/java/vboot/core/module/sys/org/group/SysOrgGroup.java index 82b13aa..5e948fc 100644 --- a/vboot-core/src/main/java/vboot/module/sys/org/group/SysOrgGroup.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/group/SysOrgGroup.java @@ -1,6 +1,6 @@ -package vboot.module.sys.org.group; +package vboot.core.module.sys.org.group; -import vboot.module.sys.org.root.SysOrg; +import vboot.core.module.sys.org.root.SysOrg; import lombok.Data; import javax.persistence.*; diff --git a/vboot-core/src/main/java/vboot/module/sys/org/group/SysOrgGroupApi.java b/vboot-core/src/main/java/vboot/core/module/sys/org/group/SysOrgGroupApi.java similarity index 90% rename from vboot-core/src/main/java/vboot/module/sys/org/group/SysOrgGroupApi.java rename to vboot-core/src/main/java/vboot/core/module/sys/org/group/SysOrgGroupApi.java index 3633e5b..404de0d 100644 --- a/vboot-core/src/main/java/vboot/module/sys/org/group/SysOrgGroupApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/group/SysOrgGroupApi.java @@ -1,7 +1,7 @@ -package vboot.module.sys.org.group; +package vboot.core.module.sys.org.group; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-core/src/main/java/vboot/module/sys/org/group/SysOrgGroupRepo.java b/vboot-core/src/main/java/vboot/core/module/sys/org/group/SysOrgGroupRepo.java similarity index 87% rename from vboot-core/src/main/java/vboot/module/sys/org/group/SysOrgGroupRepo.java rename to vboot-core/src/main/java/vboot/core/module/sys/org/group/SysOrgGroupRepo.java index 5389d56..123642f 100644 --- a/vboot-core/src/main/java/vboot/module/sys/org/group/SysOrgGroupRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/group/SysOrgGroupRepo.java @@ -1,4 +1,4 @@ -package vboot.module.sys.org.group; +package vboot.core.module.sys.org.group; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/sys/org/group/SysOrgGroupService.java b/vboot-core/src/main/java/vboot/core/module/sys/org/group/SysOrgGroupService.java similarity index 85% rename from vboot-core/src/main/java/vboot/module/sys/org/group/SysOrgGroupService.java rename to vboot-core/src/main/java/vboot/core/module/sys/org/group/SysOrgGroupService.java index 213fe3e..58c1b2e 100644 --- a/vboot-core/src/main/java/vboot/module/sys/org/group/SysOrgGroupService.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/group/SysOrgGroupService.java @@ -1,12 +1,12 @@ -package vboot.module.sys.org.group; +package vboot.core.module.sys.org.group; import cn.hutool.core.util.StrUtil; -import vboot.module.sys.org.root.SysOrg; -import vboot.module.sys.org.root.SysOrgRepo; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.api.PageData; -import vboot.common.util.lang.XstringUtil; +import vboot.core.module.sys.org.root.SysOrg; +import vboot.core.module.sys.org.root.SysOrgRepo; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.common.api.PageData; +import vboot.core.xutil.lang.XstringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/vboot-core/src/main/java/vboot/module/sys/org/post/SysOrgPost.java b/vboot-core/src/main/java/vboot/core/module/sys/org/post/SysOrgPost.java similarity index 92% rename from vboot-core/src/main/java/vboot/module/sys/org/post/SysOrgPost.java rename to vboot-core/src/main/java/vboot/core/module/sys/org/post/SysOrgPost.java index b69d51b..ce587cc 100644 --- a/vboot-core/src/main/java/vboot/module/sys/org/post/SysOrgPost.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/post/SysOrgPost.java @@ -1,6 +1,6 @@ -package vboot.module.sys.org.post; +package vboot.core.module.sys.org.post; -import vboot.module.sys.org.root.SysOrg; +import vboot.core.module.sys.org.root.SysOrg; import lombok.Data; import javax.persistence.*; diff --git a/vboot-core/src/main/java/vboot/module/sys/org/post/SysOrgPostApi.java b/vboot-core/src/main/java/vboot/core/module/sys/org/post/SysOrgPostApi.java similarity index 91% rename from vboot-core/src/main/java/vboot/module/sys/org/post/SysOrgPostApi.java rename to vboot-core/src/main/java/vboot/core/module/sys/org/post/SysOrgPostApi.java index 58e84df..b99fae6 100644 --- a/vboot-core/src/main/java/vboot/module/sys/org/post/SysOrgPostApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/post/SysOrgPostApi.java @@ -1,7 +1,7 @@ -package vboot.module.sys.org.post; +package vboot.core.module.sys.org.post; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.api.RestResult; +import vboot.core.common.dao.Sqler; +import vboot.core.common.api.RestResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-core/src/main/java/vboot/module/sys/org/post/SysOrgPostRepo.java b/vboot-core/src/main/java/vboot/core/module/sys/org/post/SysOrgPostRepo.java similarity index 78% rename from vboot-core/src/main/java/vboot/module/sys/org/post/SysOrgPostRepo.java rename to vboot-core/src/main/java/vboot/core/module/sys/org/post/SysOrgPostRepo.java index fe826ca..b640467 100644 --- a/vboot-core/src/main/java/vboot/module/sys/org/post/SysOrgPostRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/post/SysOrgPostRepo.java @@ -1,4 +1,4 @@ -package vboot.module.sys.org.post; +package vboot.core.module.sys.org.post; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/sys/org/post/SysOrgPostService.java b/vboot-core/src/main/java/vboot/core/module/sys/org/post/SysOrgPostService.java similarity index 87% rename from vboot-core/src/main/java/vboot/module/sys/org/post/SysOrgPostService.java rename to vboot-core/src/main/java/vboot/core/module/sys/org/post/SysOrgPostService.java index 0bcf2fa..f9a42b4 100644 --- a/vboot-core/src/main/java/vboot/module/sys/org/post/SysOrgPostService.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/post/SysOrgPostService.java @@ -1,12 +1,12 @@ -package vboot.module.sys.org.post; +package vboot.core.module.sys.org.post; import cn.hutool.core.util.StrUtil; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.module.sys.org.root.SysOrg; -import vboot.common.mvc.api.PageData; -import vboot.common.util.lang.XstringUtil; -import vboot.module.sys.org.root.SysOrgRepo; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.module.sys.org.root.SysOrg; +import vboot.core.common.api.PageData; +import vboot.core.xutil.lang.XstringUtil; +import vboot.core.module.sys.org.root.SysOrgRepo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/vboot-core/src/main/java/vboot/module/sys/org/rece/SysOrgRece.java b/vboot-core/src/main/java/vboot/core/module/sys/org/rece/SysOrgRece.java similarity index 92% rename from vboot-core/src/main/java/vboot/module/sys/org/rece/SysOrgRece.java rename to vboot-core/src/main/java/vboot/core/module/sys/org/rece/SysOrgRece.java index ad553a4..8fe5389 100644 --- a/vboot-core/src/main/java/vboot/module/sys/org/rece/SysOrgRece.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/rece/SysOrgRece.java @@ -1,4 +1,4 @@ -package vboot.module.sys.org.rece; +package vboot.core.module.sys.org.rece; import lombok.Data; diff --git a/vboot-core/src/main/java/vboot/module/sys/org/rece/SysOrgReceRepo.java b/vboot-core/src/main/java/vboot/core/module/sys/org/rece/SysOrgReceRepo.java similarity index 78% rename from vboot-core/src/main/java/vboot/module/sys/org/rece/SysOrgReceRepo.java rename to vboot-core/src/main/java/vboot/core/module/sys/org/rece/SysOrgReceRepo.java index 59b4af9..ba7ce69 100644 --- a/vboot-core/src/main/java/vboot/module/sys/org/rece/SysOrgReceRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/rece/SysOrgReceRepo.java @@ -1,4 +1,4 @@ -package vboot.module.sys.org.rece; +package vboot.core.module.sys.org.rece; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/sys/org/root/SysOrg.java b/vboot-core/src/main/java/vboot/core/module/sys/org/root/SysOrg.java similarity index 91% rename from vboot-core/src/main/java/vboot/module/sys/org/root/SysOrg.java rename to vboot-core/src/main/java/vboot/core/module/sys/org/root/SysOrg.java index 13a1abe..09dbbc6 100644 --- a/vboot-core/src/main/java/vboot/module/sys/org/root/SysOrg.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/root/SysOrg.java @@ -1,4 +1,4 @@ -package vboot.module.sys.org.root; +package vboot.core.module.sys.org.root; import lombok.Data; diff --git a/vboot-core/src/main/java/vboot/module/sys/org/root/SysOrgRepo.java b/vboot-core/src/main/java/vboot/core/module/sys/org/root/SysOrgRepo.java similarity index 77% rename from vboot-core/src/main/java/vboot/module/sys/org/root/SysOrgRepo.java rename to vboot-core/src/main/java/vboot/core/module/sys/org/root/SysOrgRepo.java index ecca53c..ef10001 100644 --- a/vboot-core/src/main/java/vboot/module/sys/org/root/SysOrgRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/root/SysOrgRepo.java @@ -1,4 +1,4 @@ -package vboot.module.sys.org.root; +package vboot.core.module.sys.org.root; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/sys/org/user/SysOrgUser.java b/vboot-core/src/main/java/vboot/core/module/sys/org/user/SysOrgUser.java similarity index 95% rename from vboot-core/src/main/java/vboot/module/sys/org/user/SysOrgUser.java rename to vboot-core/src/main/java/vboot/core/module/sys/org/user/SysOrgUser.java index a383328..4fabd26 100644 --- a/vboot-core/src/main/java/vboot/module/sys/org/user/SysOrgUser.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/user/SysOrgUser.java @@ -1,8 +1,8 @@ -package vboot.module.sys.org.user; +package vboot.core.module.sys.org.user; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; -import vboot.module.sys.org.root.SysOrg; +import vboot.core.module.sys.org.root.SysOrg; import javax.persistence.*; import java.util.Date; diff --git a/vboot-core/src/main/java/vboot/module/sys/org/user/SysOrgUserApi.java b/vboot-core/src/main/java/vboot/core/module/sys/org/user/SysOrgUserApi.java similarity index 91% rename from vboot-core/src/main/java/vboot/module/sys/org/user/SysOrgUserApi.java rename to vboot-core/src/main/java/vboot/core/module/sys/org/user/SysOrgUserApi.java index 30b5f3e..2f62ebe 100644 --- a/vboot-core/src/main/java/vboot/module/sys/org/user/SysOrgUserApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/user/SysOrgUserApi.java @@ -1,8 +1,8 @@ -package vboot.module.sys.org.user; +package vboot.core.module.sys.org.user; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; -import vboot.common.util.lang.XstringUtil; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; +import vboot.core.xutil.lang.XstringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-core/src/main/java/vboot/module/sys/org/user/SysOrgUserRepo.java b/vboot-core/src/main/java/vboot/core/module/sys/org/user/SysOrgUserRepo.java similarity index 85% rename from vboot-core/src/main/java/vboot/module/sys/org/user/SysOrgUserRepo.java rename to vboot-core/src/main/java/vboot/core/module/sys/org/user/SysOrgUserRepo.java index 266434d..0838edd 100644 --- a/vboot-core/src/main/java/vboot/module/sys/org/user/SysOrgUserRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/user/SysOrgUserRepo.java @@ -1,4 +1,4 @@ -package vboot.module.sys.org.user; +package vboot.core.module.sys.org.user; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/sys/org/user/SysOrgUserService.java b/vboot-core/src/main/java/vboot/core/module/sys/org/user/SysOrgUserService.java similarity index 91% rename from vboot-core/src/main/java/vboot/module/sys/org/user/SysOrgUserService.java rename to vboot-core/src/main/java/vboot/core/module/sys/org/user/SysOrgUserService.java index d9bb342..2229b03 100644 --- a/vboot-core/src/main/java/vboot/module/sys/org/user/SysOrgUserService.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/user/SysOrgUserService.java @@ -1,12 +1,12 @@ -package vboot.module.sys.org.user; +package vboot.core.module.sys.org.user; import cn.hutool.core.util.StrUtil; -import vboot.module.sys.org.root.SysOrg; -import vboot.module.sys.org.root.SysOrgRepo; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.api.PageData; -import vboot.common.util.lang.XstringUtil; +import vboot.core.module.sys.org.root.SysOrg; +import vboot.core.module.sys.org.root.SysOrgRepo; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.common.api.PageData; +import vboot.core.xutil.lang.XstringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/vboot-core/src/main/java/vboot/module/sys/perm/api/SysPermApi.java b/vboot-core/src/main/java/vboot/core/module/sys/perm/api/SysPermApi.java similarity index 92% rename from vboot-core/src/main/java/vboot/module/sys/perm/api/SysPermApi.java rename to vboot-core/src/main/java/vboot/core/module/sys/perm/api/SysPermApi.java index 2b2d9bc..c8f1b3e 100644 --- a/vboot-core/src/main/java/vboot/module/sys/perm/api/SysPermApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/perm/api/SysPermApi.java @@ -1,4 +1,4 @@ -package vboot.module.sys.perm.api; +package vboot.core.module.sys.perm.api; import lombok.Data; diff --git a/vboot-core/src/main/java/vboot/module/sys/perm/api/SysPermApiApi.java b/vboot-core/src/main/java/vboot/core/module/sys/perm/api/SysPermApiApi.java similarity index 86% rename from vboot-core/src/main/java/vboot/module/sys/perm/api/SysPermApiApi.java rename to vboot-core/src/main/java/vboot/core/module/sys/perm/api/SysPermApiApi.java index e2d0871..3c4ef49 100644 --- a/vboot-core/src/main/java/vboot/module/sys/perm/api/SysPermApiApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/perm/api/SysPermApiApi.java @@ -1,10 +1,10 @@ -package vboot.module.sys.perm.api; +package vboot.core.module.sys.perm.api; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.pojo.ZidName; -import vboot.common.mvc.pojo.Zinp; -import vboot.common.util.lang.XstringUtil; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.api.RestResult; +import vboot.core.common.pojo.ZidName; +import vboot.core.common.pojo.Zinp; +import vboot.core.xutil.lang.XstringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-core/src/main/java/vboot/module/sys/perm/api/SysPermApiRepo.java b/vboot-core/src/main/java/vboot/core/module/sys/perm/api/SysPermApiRepo.java similarity index 78% rename from vboot-core/src/main/java/vboot/module/sys/perm/api/SysPermApiRepo.java rename to vboot-core/src/main/java/vboot/core/module/sys/perm/api/SysPermApiRepo.java index 3a0e5eb..973b0ab 100644 --- a/vboot-core/src/main/java/vboot/module/sys/perm/api/SysPermApiRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/perm/api/SysPermApiRepo.java @@ -1,4 +1,4 @@ -package vboot.module.sys.perm.api; +package vboot.core.module.sys.perm.api; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/sys/perm/api/SysPermApiService.java b/vboot-core/src/main/java/vboot/core/module/sys/perm/api/SysPermApiService.java similarity index 98% rename from vboot-core/src/main/java/vboot/module/sys/perm/api/SysPermApiService.java rename to vboot-core/src/main/java/vboot/core/module/sys/perm/api/SysPermApiService.java index 65d4aa9..57a64bd 100644 --- a/vboot-core/src/main/java/vboot/module/sys/perm/api/SysPermApiService.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/perm/api/SysPermApiService.java @@ -1,11 +1,11 @@ -package vboot.module.sys.perm.api; +package vboot.core.module.sys.perm.api; import cn.hutool.core.lang.ClassScanner; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.pojo.Zinp; -import vboot.common.util.lang.XmapUtil; -import vboot.common.util.web.XuserUtil; -import vboot.config.security.pojo.Zuser; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.pojo.Zinp; +import vboot.core.xutil.lang.XmapUtil; +import vboot.core.xutil.web.XuserUtil; +import vboot.core.security.pojo.Zuser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/vboot-core/src/main/java/vboot/module/sys/perm/api/Yperm.java b/vboot-core/src/main/java/vboot/core/module/sys/perm/api/Yperm.java similarity index 88% rename from vboot-core/src/main/java/vboot/module/sys/perm/api/Yperm.java rename to vboot-core/src/main/java/vboot/core/module/sys/perm/api/Yperm.java index 8496597..e3fab4b 100644 --- a/vboot-core/src/main/java/vboot/module/sys/perm/api/Yperm.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/perm/api/Yperm.java @@ -1,4 +1,4 @@ -package vboot.module.sys.perm.api; +package vboot.core.module.sys.perm.api; import lombok.Data; diff --git a/vboot-core/src/main/java/vboot/module/sys/perm/api/Zperm.java b/vboot-core/src/main/java/vboot/core/module/sys/perm/api/Zperm.java similarity index 89% rename from vboot-core/src/main/java/vboot/module/sys/perm/api/Zperm.java rename to vboot-core/src/main/java/vboot/core/module/sys/perm/api/Zperm.java index 51cfd25..d958536 100644 --- a/vboot-core/src/main/java/vboot/module/sys/perm/api/Zperm.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/perm/api/Zperm.java @@ -1,4 +1,4 @@ -package vboot.module.sys.perm.api; +package vboot.core.module.sys.perm.api; public class Zperm { diff --git a/vboot-core/src/main/java/vboot/module/sys/perm/menu/SysPermMenu.java b/vboot-core/src/main/java/vboot/core/module/sys/perm/menu/SysPermMenu.java similarity index 97% rename from vboot-core/src/main/java/vboot/module/sys/perm/menu/SysPermMenu.java rename to vboot-core/src/main/java/vboot/core/module/sys/perm/menu/SysPermMenu.java index 792183a..9421fdc 100644 --- a/vboot-core/src/main/java/vboot/module/sys/perm/menu/SysPermMenu.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/perm/menu/SysPermMenu.java @@ -1,4 +1,4 @@ -package vboot.module.sys.perm.menu; +package vboot.core.module.sys.perm.menu; import lombok.Data; diff --git a/vboot-core/src/main/java/vboot/module/sys/perm/menu/SysPermMenuApi.java b/vboot-core/src/main/java/vboot/core/module/sys/perm/menu/SysPermMenuApi.java similarity index 91% rename from vboot-core/src/main/java/vboot/module/sys/perm/menu/SysPermMenuApi.java rename to vboot-core/src/main/java/vboot/core/module/sys/perm/menu/SysPermMenuApi.java index f1c99ea..fa04454 100644 --- a/vboot-core/src/main/java/vboot/module/sys/perm/menu/SysPermMenuApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/perm/menu/SysPermMenuApi.java @@ -1,9 +1,9 @@ -package vboot.module.sys.perm.menu; +package vboot.core.module.sys.perm.menu; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.util.lang.XstringUtil; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.xutil.lang.XstringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-core/src/main/java/vboot/module/sys/perm/menu/SysPermMenuRepo.java b/vboot-core/src/main/java/vboot/core/module/sys/perm/menu/SysPermMenuRepo.java similarity index 88% rename from vboot-core/src/main/java/vboot/module/sys/perm/menu/SysPermMenuRepo.java rename to vboot-core/src/main/java/vboot/core/module/sys/perm/menu/SysPermMenuRepo.java index 7df308c..7e9691b 100644 --- a/vboot-core/src/main/java/vboot/module/sys/perm/menu/SysPermMenuRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/perm/menu/SysPermMenuRepo.java @@ -1,4 +1,4 @@ -package vboot.module.sys.perm.menu; +package vboot.core.module.sys.perm.menu; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/sys/perm/menu/SysPermMenuService.java b/vboot-core/src/main/java/vboot/core/module/sys/perm/menu/SysPermMenuService.java similarity index 97% rename from vboot-core/src/main/java/vboot/module/sys/perm/menu/SysPermMenuService.java rename to vboot-core/src/main/java/vboot/core/module/sys/perm/menu/SysPermMenuService.java index f2d1887..18885f6 100644 --- a/vboot-core/src/main/java/vboot/module/sys/perm/menu/SysPermMenuService.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/perm/menu/SysPermMenuService.java @@ -1,9 +1,9 @@ -package vboot.module.sys.perm.menu; +package vboot.core.module.sys.perm.menu; import cn.hutool.core.util.StrUtil; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.util.lang.XstringUtil; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.xutil.lang.XstringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.stereotype.Service; diff --git a/vboot-core/src/main/java/vboot/module/sys/perm/role/SysPermRole.java b/vboot-core/src/main/java/vboot/core/module/sys/perm/role/SysPermRole.java similarity index 81% rename from vboot-core/src/main/java/vboot/module/sys/perm/role/SysPermRole.java rename to vboot-core/src/main/java/vboot/core/module/sys/perm/role/SysPermRole.java index fbf46bf..d1d3b6a 100644 --- a/vboot-core/src/main/java/vboot/module/sys/perm/role/SysPermRole.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/perm/role/SysPermRole.java @@ -1,10 +1,10 @@ -package vboot.module.sys.perm.role; +package vboot.core.module.sys.perm.role; import lombok.Getter; import lombok.Setter; -import vboot.common.mvc.entity.BaseMainEntity; -import vboot.module.sys.org.root.SysOrg; -import vboot.module.sys.perm.menu.SysPermMenu; +import vboot.core.common.entity.BaseMainEntity; +import vboot.core.module.sys.org.root.SysOrg; +import vboot.core.module.sys.perm.menu.SysPermMenu; import javax.persistence.*; import java.util.ArrayList; diff --git a/vboot-core/src/main/java/vboot/module/sys/perm/role/SysPermRoleApi.java b/vboot-core/src/main/java/vboot/core/module/sys/perm/role/SysPermRoleApi.java similarity index 93% rename from vboot-core/src/main/java/vboot/module/sys/perm/role/SysPermRoleApi.java rename to vboot-core/src/main/java/vboot/core/module/sys/perm/role/SysPermRoleApi.java index d8ea96d..1fbf7cc 100644 --- a/vboot-core/src/main/java/vboot/module/sys/perm/role/SysPermRoleApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/perm/role/SysPermRoleApi.java @@ -1,8 +1,8 @@ -package vboot.module.sys.perm.role; +package vboot.core.module.sys.perm.role; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.common.api.RestResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-core/src/main/java/vboot/module/sys/perm/role/SysPermRoleRepo.java b/vboot-core/src/main/java/vboot/core/module/sys/perm/role/SysPermRoleRepo.java similarity index 77% rename from vboot-core/src/main/java/vboot/module/sys/perm/role/SysPermRoleRepo.java rename to vboot-core/src/main/java/vboot/core/module/sys/perm/role/SysPermRoleRepo.java index bb53a9a..6745bb0 100644 --- a/vboot-core/src/main/java/vboot/module/sys/perm/role/SysPermRoleRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/perm/role/SysPermRoleRepo.java @@ -1,4 +1,4 @@ -package vboot.module.sys.perm.role; +package vboot.core.module.sys.perm.role; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/sys/perm/role/SysPermRoleService.java b/vboot-core/src/main/java/vboot/core/module/sys/perm/role/SysPermRoleService.java similarity index 81% rename from vboot-core/src/main/java/vboot/module/sys/perm/role/SysPermRoleService.java rename to vboot-core/src/main/java/vboot/core/module/sys/perm/role/SysPermRoleService.java index ecdc6a8..babd4d3 100644 --- a/vboot-core/src/main/java/vboot/module/sys/perm/role/SysPermRoleService.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/perm/role/SysPermRoleService.java @@ -1,6 +1,6 @@ -package vboot.module.sys.perm.role; +package vboot.core.module.sys.perm.role; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-core/src/main/java/vboot/module/sys/todo/done/SysTodoDone.java b/vboot-core/src/main/java/vboot/core/module/sys/todo/done/SysTodoDone.java similarity index 92% rename from vboot-core/src/main/java/vboot/module/sys/todo/done/SysTodoDone.java rename to vboot-core/src/main/java/vboot/core/module/sys/todo/done/SysTodoDone.java index 82c547b..547e929 100644 --- a/vboot-core/src/main/java/vboot/module/sys/todo/done/SysTodoDone.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/todo/done/SysTodoDone.java @@ -1,4 +1,4 @@ -package vboot.module.sys.todo.done; +package vboot.core.module.sys.todo.done; import lombok.Getter; import lombok.Setter; diff --git a/vboot-core/src/main/java/vboot/module/sys/todo/done/SysTodoDoneRepo.java b/vboot-core/src/main/java/vboot/core/module/sys/todo/done/SysTodoDoneRepo.java similarity index 77% rename from vboot-core/src/main/java/vboot/module/sys/todo/done/SysTodoDoneRepo.java rename to vboot-core/src/main/java/vboot/core/module/sys/todo/done/SysTodoDoneRepo.java index 1cab6d0..12aba75 100644 --- a/vboot-core/src/main/java/vboot/module/sys/todo/done/SysTodoDoneRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/todo/done/SysTodoDoneRepo.java @@ -1,4 +1,4 @@ -package vboot.module.sys.todo.done; +package vboot.core.module.sys.todo.done; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/sys/todo/hist/SysTodoHist.java b/vboot-core/src/main/java/vboot/core/module/sys/todo/hist/SysTodoHist.java similarity index 96% rename from vboot-core/src/main/java/vboot/module/sys/todo/hist/SysTodoHist.java rename to vboot-core/src/main/java/vboot/core/module/sys/todo/hist/SysTodoHist.java index d26bccb..9d50915 100644 --- a/vboot-core/src/main/java/vboot/module/sys/todo/hist/SysTodoHist.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/todo/hist/SysTodoHist.java @@ -1,4 +1,4 @@ -package vboot.module.sys.todo.hist; +package vboot.core.module.sys.todo.hist; import lombok.Getter; diff --git a/vboot-core/src/main/java/vboot/module/sys/todo/main/SysTodoMain.java b/vboot-core/src/main/java/vboot/core/module/sys/todo/main/SysTodoMain.java similarity index 95% rename from vboot-core/src/main/java/vboot/module/sys/todo/main/SysTodoMain.java rename to vboot-core/src/main/java/vboot/core/module/sys/todo/main/SysTodoMain.java index 4c9bcec..260b39b 100644 --- a/vboot-core/src/main/java/vboot/module/sys/todo/main/SysTodoMain.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/todo/main/SysTodoMain.java @@ -1,4 +1,4 @@ -package vboot.module.sys.todo.main; +package vboot.core.module.sys.todo.main; import lombok.Getter; diff --git a/vboot-core/src/main/java/vboot/module/sys/todo/main/SysTodoMainApi.java b/vboot-core/src/main/java/vboot/core/module/sys/todo/main/SysTodoMainApi.java similarity index 89% rename from vboot-core/src/main/java/vboot/module/sys/todo/main/SysTodoMainApi.java rename to vboot-core/src/main/java/vboot/core/module/sys/todo/main/SysTodoMainApi.java index b8b0d14..7c73166 100644 --- a/vboot-core/src/main/java/vboot/module/sys/todo/main/SysTodoMainApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/todo/main/SysTodoMainApi.java @@ -1,8 +1,8 @@ -package vboot.module.sys.todo.main; +package vboot.core.module.sys.todo.main; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; import org.dom4j.DocumentException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-core/src/main/java/vboot/module/sys/todo/main/SysTodoMainRepo.java b/vboot-core/src/main/java/vboot/core/module/sys/todo/main/SysTodoMainRepo.java similarity index 77% rename from vboot-core/src/main/java/vboot/module/sys/todo/main/SysTodoMainRepo.java rename to vboot-core/src/main/java/vboot/core/module/sys/todo/main/SysTodoMainRepo.java index 4c520af..cfefaca 100644 --- a/vboot-core/src/main/java/vboot/module/sys/todo/main/SysTodoMainRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/todo/main/SysTodoMainRepo.java @@ -1,4 +1,4 @@ -package vboot.module.sys.todo.main; +package vboot.core.module.sys.todo.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/module/sys/todo/main/SysTodoMainService.java b/vboot-core/src/main/java/vboot/core/module/sys/todo/main/SysTodoMainService.java similarity index 84% rename from vboot-core/src/main/java/vboot/module/sys/todo/main/SysTodoMainService.java rename to vboot-core/src/main/java/vboot/core/module/sys/todo/main/SysTodoMainService.java index 45f9a52..6bbc251 100644 --- a/vboot-core/src/main/java/vboot/module/sys/todo/main/SysTodoMainService.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/todo/main/SysTodoMainService.java @@ -1,13 +1,13 @@ -package vboot.module.sys.todo.main; +package vboot.core.module.sys.todo.main; -import vboot.module.bpm.proc.main.Zbpm; -import vboot.module.bpm.proc.main.Znode; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.util.lang.XstringUtil; -import vboot.module.sys.todo.done.SysTodoDone; -import vboot.module.sys.todo.done.SysTodoDoneRepo; -import vboot.module.sys.todo.user.SysTodoUser; -import vboot.module.sys.todo.user.SysTodoUserRepo; +import vboot.core.module.bpm.proc.main.Zbpm; +import vboot.core.module.bpm.proc.main.Znode; +import vboot.core.common.dao.JdbcDao; +import vboot.core.xutil.lang.XstringUtil; +import vboot.core.module.sys.todo.done.SysTodoDone; +import vboot.core.module.sys.todo.done.SysTodoDoneRepo; +import vboot.core.module.sys.todo.user.SysTodoUser; +import vboot.core.module.sys.todo.user.SysTodoUserRepo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/vboot-core/src/main/java/vboot/module/sys/todo/user/SysTodoUser.java b/vboot-core/src/main/java/vboot/core/module/sys/todo/user/SysTodoUser.java similarity index 90% rename from vboot-core/src/main/java/vboot/module/sys/todo/user/SysTodoUser.java rename to vboot-core/src/main/java/vboot/core/module/sys/todo/user/SysTodoUser.java index 065647a..f177cc8 100644 --- a/vboot-core/src/main/java/vboot/module/sys/todo/user/SysTodoUser.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/todo/user/SysTodoUser.java @@ -1,4 +1,4 @@ -package vboot.module.sys.todo.user; +package vboot.core.module.sys.todo.user; import lombok.Getter; import lombok.Setter; diff --git a/vboot-core/src/main/java/vboot/module/sys/todo/user/SysTodoUserRepo.java b/vboot-core/src/main/java/vboot/core/module/sys/todo/user/SysTodoUserRepo.java similarity index 77% rename from vboot-core/src/main/java/vboot/module/sys/todo/user/SysTodoUserRepo.java rename to vboot-core/src/main/java/vboot/core/module/sys/todo/user/SysTodoUserRepo.java index 51eb7c7..291b486 100644 --- a/vboot-core/src/main/java/vboot/module/sys/todo/user/SysTodoUserRepo.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/todo/user/SysTodoUserRepo.java @@ -1,4 +1,4 @@ -package vboot.module.sys.todo.user; +package vboot.core.module.sys.todo.user; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/config/security/SecurityConfig.java b/vboot-core/src/main/java/vboot/core/security/SecurityConfig.java similarity index 86% rename from vboot-core/src/main/java/vboot/config/security/SecurityConfig.java rename to vboot-core/src/main/java/vboot/core/security/SecurityConfig.java index 42d10a5..ea232f8 100644 --- a/vboot-core/src/main/java/vboot/config/security/SecurityConfig.java +++ b/vboot-core/src/main/java/vboot/core/security/SecurityConfig.java @@ -1,10 +1,10 @@ -package vboot.config.security; +package vboot.core.security; -import vboot.config.dbx.redis.RedisHandler; -import vboot.config.security.authn.AuthnFailedHandler; -import vboot.config.security.authz.AuthzDeniedHandler; -import vboot.config.security.jwt.JwtFilterAdapter; -import vboot.config.security.jwt.JwtHandler; +import vboot.core.config.dbx.redis.RedisHandler; +import vboot.core.security.authc.AuthcFailedHandler; +import vboot.core.security.authz.AuthzDeniedHandler; +import vboot.core.security.authz.JwtFilterAdapter; +import vboot.core.security.authz.JwtHandler; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -42,7 +42,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { //4.过滤器异常与授权失败处理 http.exceptionHandling() - .authenticationEntryPoint(authnFailedHandler) + .authenticationEntryPoint(authcFailedHandler) .accessDeniedHandler(authzDeniedHandler); //5.授权配置 @@ -90,15 +90,14 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { //<<-------------------------------4.过滤器异常与授权失败处理------------------------------- private final AuthzDeniedHandler authzDeniedHandler;//解决认证过的用户访问无权限资源时的异常 - private final AuthnFailedHandler authnFailedHandler;//解决匿名用户访问无权限资源时的异常 + private final AuthcFailedHandler authcFailedHandler;//解决匿名用户访问无权限资源时的异常 //>> //<<-------------------------------X.其他配置------------------------------- //配置security忽略的请求与资源 @Override public void configure(WebSecurity web) { - web.ignoring().antMatchers("/","/assets/**","/assets/**","/druid/**","/login", "/pub/**","/index.html","/vben.html","/vue.html","/favicon.ico","/resource/**","/_app.config.js"); -// web.ignoring().antMatchers("/","/sys/**","/oa/**","/sa/**","/te/**","/assets/**","/druid/**","/login", "/pub/**","/index.html","/vben.html","/favicon.ico","/resource/**","/_app.config.js"); + web.ignoring().antMatchers("/","/assets/**","/druid/**","/login", "/index.html","/vben.html","/vue.html","/favicon.ico","/resource/**","/_app.config.js"); // web.ignoring().antMatchers("/assets/**","/**"); } diff --git a/vboot-core/src/main/java/vboot/config/security/authn/AuthnController.java b/vboot-core/src/main/java/vboot/core/security/authc/AuthcApi.java similarity index 69% rename from vboot-core/src/main/java/vboot/config/security/authn/AuthnController.java rename to vboot-core/src/main/java/vboot/core/security/authc/AuthcApi.java index 3b8145a..990c0e3 100644 --- a/vboot-core/src/main/java/vboot/config/security/authn/AuthnController.java +++ b/vboot-core/src/main/java/vboot/core/security/authc/AuthcApi.java @@ -1,17 +1,15 @@ -package vboot.config.security.authn; +package vboot.core.security.authc; import cn.hutool.core.util.IdUtil; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.JdbcDao; -import vboot.config.AppConfig; -import vboot.config.dbx.redis.RedisHandler; -import vboot.config.security.jwt.JwtHandler; -import vboot.config.security.pojo.Duser; -import vboot.config.security.pojo.Zmenu; -import vboot.config.security.pojo.Zmeta; -import vboot.config.security.pojo.Zuser; -import vboot.module.sys.log.login.SysLogLoginService; -import vboot.module.sys.org.user.SysOrgUserService; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.config.AppConfig; +import vboot.core.config.dbx.ldap.LdapHandler; +import vboot.core.config.dbx.redis.RedisHandler; +import vboot.core.security.authz.JwtHandler; +import vboot.core.security.pojo.*; +import vboot.core.module.sys.log.login.SysLogLoginService; +import vboot.core.module.sys.org.user.SysOrgUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; import org.springframework.jdbc.core.BeanPropertyRowMapper; @@ -33,28 +31,28 @@ import java.util.Map; @RestController -public class AuthnController { +public class AuthcApi { @PostMapping("/login") - public RestResult login(@Valid @RequestBody LoginDto loginDTO, HttpServletRequest request) throws IOException, ClassNotFoundException { + public RestResult login(@Valid @RequestBody LoginVo loginVo, HttpServletRequest request) throws IOException, ClassNotFoundException { // System.out.println("开始登录"); //1.登录验证 - Duser duser = null; + UserDo userDo = null; try { - duser = jdbcDao.getTp().queryForObject("select id,name,pacod,retag from sys_org_user where usnam=? and avtag=1", - new Object[]{loginDTO.getUsername()}, new BeanPropertyRowMapper<>(Duser.class)); + userDo = jdbcDao.getTp().queryForObject("select id,name,pacod,retag from sys_org_user where usnam=? and avtag=1", + new Object[]{loginVo.getUsername()}, new BeanPropertyRowMapper<>(UserDo.class)); } catch (DataAccessException ignored) { } boolean passFlag = false; - if (duser != null) { - String encodePassword = DigestUtils.md5DigestAsHex(("abc" + loginDTO.getPassword() + "xyz").getBytes());//数据库密码验证 - if (encodePassword.equals(duser.getPacod())) { + if (userDo != null) { + String encodePassword = DigestUtils.md5DigestAsHex(("abc" + loginVo.getPassword() + "xyz").getBytes());//数据库密码验证 + if (encodePassword.equals(userDo.getPacod())) { passFlag = true; } else { - passFlag = ldapService.authenticate(loginDTO.getUsername(), loginDTO.getPassword());//AD域密码验证 + passFlag = ldapHandler.authenticate(loginVo.getUsername(), loginVo.getPassword());//AD域密码验证 } } if (!passFlag) { @@ -64,14 +62,14 @@ public class AuthnController { //2.初始化用户信息，获取菜单与权限 String atokenUUID = IdUtil.simpleUUID(); String atoken = jwtHandler.createTokenByUuid(atokenUUID); - String rtoken = jwtHandler.createTokenByUuid(loginDTO.getUsername());//需要加密下 + String rtoken = jwtHandler.createTokenByUuid(loginVo.getUsername());//需要加密下 Map backMap = new HashMap<>(); backMap.put("token", atoken); backMap.put("rtoken", rtoken); - Zuser zuser = new Zuser(duser.getId(), duser.getName(), loginDTO.getUsername()); - authnService.initZuser(zuser, duser, backMap);//初始化用户 + Zuser zuser = new Zuser(userDo.getId(), userDo.getName(), loginVo.getUsername()); + authnService.initZuser(zuser, userDo, backMap);//初始化用户 redisHandler.set(atokenUUID, zuser, appConfig.getJwt().getAtime());//默认8小时过期 @@ -95,6 +93,14 @@ public class AuthnController { return RestResult.ok(backMap); } + + @GetMapping("/getUserInfo") + public RestResult getUserInfo(Authentication auth, HttpServletRequest request) { + Zuser zuser = (Zuser) auth.getPrincipal(); + sysLogLoginService.save(zuser,request); + return RestResult.ok(zuser); + } + @GetMapping("/getMenuList") public RestResult getMenuList(Authentication auth) { List zmenuList = new ArrayList<>(); @@ -131,7 +137,7 @@ public class AuthnController { @Autowired - private AuthnService authnService; + private AuthcService authnService; @Autowired private AppConfig appConfig; @@ -143,7 +149,7 @@ public class AuthnController { private JwtHandler jwtHandler; @Autowired - private LdapService ldapService; + private LdapHandler ldapHandler; @Autowired private JdbcDao jdbcDao; diff --git a/vboot-core/src/main/java/vboot/config/security/authn/AuthnFailedHandler.java b/vboot-core/src/main/java/vboot/core/security/authc/AuthcFailedHandler.java similarity index 94% rename from vboot-core/src/main/java/vboot/config/security/authn/AuthnFailedHandler.java rename to vboot-core/src/main/java/vboot/core/security/authc/AuthcFailedHandler.java index 3b132d5..c009057 100644 --- a/vboot-core/src/main/java/vboot/config/security/authn/AuthnFailedHandler.java +++ b/vboot-core/src/main/java/vboot/core/security/authc/AuthcFailedHandler.java @@ -1,4 +1,4 @@ -package vboot.config.security.authn; +package vboot.core.security.authc; import com.alibaba.fastjson.JSON; import org.apache.http.HttpStatus; @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Optional; @Component -public class AuthnFailedHandler implements AuthenticationEntryPoint { +public class AuthcFailedHandler implements AuthenticationEntryPoint { @Override public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e) throws IOException { diff --git a/vboot-core/src/main/java/vboot/config/security/authn/AuthnService.java b/vboot-core/src/main/java/vboot/core/security/authc/AuthcService.java similarity index 95% rename from vboot-core/src/main/java/vboot/config/security/authn/AuthnService.java rename to vboot-core/src/main/java/vboot/core/security/authc/AuthcService.java index 2fe74cf..116df69 100644 --- a/vboot-core/src/main/java/vboot/config/security/authn/AuthnService.java +++ b/vboot-core/src/main/java/vboot/core/security/authc/AuthcService.java @@ -1,12 +1,12 @@ -package vboot.config.security.authn; +package vboot.core.security.authc; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import vboot.common.mvc.dao.JdbcDao; -import vboot.config.security.pojo.Duser; -import vboot.config.security.pojo.Zmenu; -import vboot.config.security.pojo.Zmeta; -import vboot.config.security.pojo.Zuser; +import vboot.core.common.dao.JdbcDao; +import vboot.core.security.pojo.UserDo; +import vboot.core.security.pojo.Zmenu; +import vboot.core.security.pojo.Zmeta; +import vboot.core.security.pojo.Zuser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -18,12 +18,12 @@ import java.util.Map; @Service @Transactional(rollbackFor = Exception.class) -public class AuthnService { +public class AuthcService { - public void initZuser(Zuser zuser, Duser duser, Map backMap) { - if (!duser.getRetag()) { + public void initZuser(Zuser zuser, UserDo userDo, Map backMap) { + if (!userDo.getRetag()) { //1.获取用户所有的组织架构集:conds - String conds = findConds(duser); + String conds = findConds(userDo); zuser.setConds(conds); //2.根据组织架构集conds查询前台菜单集:menus @@ -128,7 +128,7 @@ public class AuthnService { // } - private String findConds(Duser duser) { + private String findConds(UserDo duser) { StringBuilder conds = new StringBuilder(); //1. conds拼接父级id if (StrUtil.isNotBlank(duser.getTier())) { diff --git a/vboot-core/src/main/java/vboot/config/security/authz/AuthzDeniedHandler.java b/vboot-core/src/main/java/vboot/core/security/authz/AuthzDeniedHandler.java similarity index 97% rename from vboot-core/src/main/java/vboot/config/security/authz/AuthzDeniedHandler.java rename to vboot-core/src/main/java/vboot/core/security/authz/AuthzDeniedHandler.java index 2e827cb..6e04780 100644 --- a/vboot-core/src/main/java/vboot/config/security/authz/AuthzDeniedHandler.java +++ b/vboot-core/src/main/java/vboot/core/security/authz/AuthzDeniedHandler.java @@ -1,4 +1,4 @@ -package vboot.config.security.authz; +package vboot.core.security.authz; import com.alibaba.fastjson.JSON; import org.apache.http.HttpStatus; diff --git a/vboot-core/src/main/java/vboot/config/security/jwt/JwtFilter.java b/vboot-core/src/main/java/vboot/core/security/authz/AuthzFilter.java similarity index 90% rename from vboot-core/src/main/java/vboot/config/security/jwt/JwtFilter.java rename to vboot-core/src/main/java/vboot/core/security/authz/AuthzFilter.java index e856826..5dec31b 100644 --- a/vboot-core/src/main/java/vboot/config/security/jwt/JwtFilter.java +++ b/vboot-core/src/main/java/vboot/core/security/authz/AuthzFilter.java @@ -1,7 +1,7 @@ -package vboot.config.security.jwt; +package vboot.core.security.authz; -import vboot.config.dbx.redis.RedisHandler; -import vboot.config.security.pojo.Zuser; +import vboot.core.config.dbx.redis.RedisHandler; +import vboot.core.security.pojo.Zuser; import lombok.extern.slf4j.Slf4j; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -16,14 +16,14 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; @Slf4j -public class JwtFilter extends OncePerRequestFilter { +public class AuthzFilter extends OncePerRequestFilter { private final JwtHandler jwtHandler; private final RedisHandler redisHandler; - public JwtFilter(JwtHandler jwtHandler, RedisHandler redisHandler) { + public AuthzFilter(JwtHandler jwtHandler, RedisHandler redisHandler) { this.jwtHandler = jwtHandler; this.redisHandler = redisHandler; } diff --git a/vboot-core/src/main/java/vboot/config/security/authz/AuthzHandler.java b/vboot-core/src/main/java/vboot/core/security/authz/AuthzHandler.java similarity index 87% rename from vboot-core/src/main/java/vboot/config/security/authz/AuthzHandler.java rename to vboot-core/src/main/java/vboot/core/security/authz/AuthzHandler.java index 32aaa2e..07bbdc2 100644 --- a/vboot-core/src/main/java/vboot/config/security/authz/AuthzHandler.java +++ b/vboot-core/src/main/java/vboot/core/security/authz/AuthzHandler.java @@ -1,6 +1,6 @@ -package vboot.config.security.authz; +package vboot.core.security.authz; -import vboot.config.security.pojo.Zuser; +import vboot.core.security.pojo.Zuser; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Component; @@ -19,7 +19,6 @@ public class AuthzHandler { return false; } - return true; } diff --git a/vboot-core/src/main/java/vboot/config/security/jwt/JwtFilterAdapter.java b/vboot-core/src/main/java/vboot/core/security/authz/JwtFilterAdapter.java similarity index 82% rename from vboot-core/src/main/java/vboot/config/security/jwt/JwtFilterAdapter.java rename to vboot-core/src/main/java/vboot/core/security/authz/JwtFilterAdapter.java index 65436bc..d58abe6 100644 --- a/vboot-core/src/main/java/vboot/config/security/jwt/JwtFilterAdapter.java +++ b/vboot-core/src/main/java/vboot/core/security/authz/JwtFilterAdapter.java @@ -1,7 +1,7 @@ -package vboot.config.security.jwt; +package vboot.core.security.authz; import lombok.RequiredArgsConstructor; -import vboot.config.dbx.redis.RedisHandler; +import vboot.core.config.dbx.redis.RedisHandler; import org.springframework.security.config.annotation.SecurityConfigurerAdapter; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.web.DefaultSecurityFilterChain; @@ -16,7 +16,7 @@ public class JwtFilterAdapter extends SecurityConfigurerAdapter 4.0.0 - vboot-extend-bi + vboot-extend diff --git a/vboot-extend-bi/src/main/java/vboot/bi/conn/main/BiConnMain.java b/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMain.java similarity index 77% rename from vboot-extend-bi/src/main/java/vboot/bi/conn/main/BiConnMain.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMain.java index e385a81..cc02ab7 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/conn/main/BiConnMain.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMain.java @@ -1,6 +1,6 @@ -package vboot.bi.conn.main; +package vboot.extend.module.bi.conn.main; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/conn/main/BiConnMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainApi.java similarity index 82% rename from vboot-extend-bi/src/main/java/vboot/bi/conn/main/BiConnMainApi.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainApi.java index 4df0afd..7366a06 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/conn/main/BiConnMainApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainApi.java @@ -1,9 +1,9 @@ -package vboot.bi.conn.main; +package vboot.extend.module.bi.conn.main; -import vboot.bi.table.main.BiTableMain; -import vboot.bi.table.main.BiTableMainService; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.extend.module.bi.table.main.BiTableMain; +import vboot.extend.module.bi.table.main.BiTableMainService; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/conn/main/BiConnMainRepo.java b/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainRepo.java similarity index 77% rename from vboot-extend-bi/src/main/java/vboot/bi/conn/main/BiConnMainRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainRepo.java index ed8a5bb..f03f406 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/conn/main/BiConnMainRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainRepo.java @@ -1,4 +1,4 @@ -package vboot.bi.conn.main; +package vboot.extend.module.bi.conn.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/conn/main/BiConnMainService.java b/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainService.java similarity index 81% rename from vboot-extend-bi/src/main/java/vboot/bi/conn/main/BiConnMainService.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainService.java index 9d67c4c..18de00e 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/conn/main/BiConnMainService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainService.java @@ -1,6 +1,6 @@ -package vboot.bi.conn.main; +package vboot.extend.module.bi.conn.main; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/demo/boy/BiDemoBoy.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoy.java similarity index 67% rename from vboot-extend-bi/src/main/java/vboot/bi/demo/boy/BiDemoBoy.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoy.java index 6b4f4f2..d464e35 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/demo/boy/BiDemoBoy.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoy.java @@ -1,6 +1,6 @@ -package vboot.bi.demo.boy; +package vboot.extend.module.bi.demo.boy; -import vboot.common.mvc.entity.BaseEntity; +import vboot.core.common.entity.BaseEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/demo/boy/BiDemoBoyApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyApi.java similarity index 90% rename from vboot-extend-bi/src/main/java/vboot/bi/demo/boy/BiDemoBoyApi.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyApi.java index 6373d78..c88e8f1 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/demo/boy/BiDemoBoyApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyApi.java @@ -1,8 +1,8 @@ -package vboot.bi.demo.boy; +package vboot.extend.module.bi.demo.boy; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; -import vboot.common.util.lang.XstringUtil; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; +import vboot.core.xutil.lang.XstringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/demo/boy/BiDemoBoyRepo.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyRepo.java similarity index 77% rename from vboot-extend-bi/src/main/java/vboot/bi/demo/boy/BiDemoBoyRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyRepo.java index c814405..b357b2d 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/demo/boy/BiDemoBoyRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyRepo.java @@ -1,4 +1,4 @@ -package vboot.bi.demo.boy; +package vboot.extend.module.bi.demo.boy; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/demo/boy/BiDemoBoyService.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyService.java similarity index 83% rename from vboot-extend-bi/src/main/java/vboot/bi/demo/boy/BiDemoBoyService.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyService.java index ee1b275..58730b5 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/demo/boy/BiDemoBoyService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyService.java @@ -1,6 +1,6 @@ -package vboot.bi.demo.boy; +package vboot.extend.module.bi.demo.boy; -import vboot.common.mvc.service.BaseService; +import vboot.core.common.service.BaseService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/demo/girl/BiDemoGirl.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirl.java similarity index 67% rename from vboot-extend-bi/src/main/java/vboot/bi/demo/girl/BiDemoGirl.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirl.java index 531b2ee..2b731e8 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/demo/girl/BiDemoGirl.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirl.java @@ -1,6 +1,6 @@ -package vboot.bi.demo.girl; +package vboot.extend.module.bi.demo.girl; -import vboot.common.mvc.entity.BaseEntity; +import vboot.core.common.entity.BaseEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/demo/girl/BiDemoGirlApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlApi.java similarity index 90% rename from vboot-extend-bi/src/main/java/vboot/bi/demo/girl/BiDemoGirlApi.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlApi.java index 4025055..69873d9 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/demo/girl/BiDemoGirlApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlApi.java @@ -1,7 +1,7 @@ -package vboot.bi.demo.girl; +package vboot.extend.module.bi.demo.girl; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/demo/girl/BiDemoGirlRepo.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlRepo.java similarity index 77% rename from vboot-extend-bi/src/main/java/vboot/bi/demo/girl/BiDemoGirlRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlRepo.java index 70b92b4..7059252 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/demo/girl/BiDemoGirlRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlRepo.java @@ -1,4 +1,4 @@ -package vboot.bi.demo.girl; +package vboot.extend.module.bi.demo.girl; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/demo/girl/BiDemoGirlService.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlService.java similarity index 83% rename from vboot-extend-bi/src/main/java/vboot/bi/demo/girl/BiDemoGirlService.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlService.java index 550f98a..39db6b2 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/demo/girl/BiDemoGirlService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlService.java @@ -1,6 +1,6 @@ -package vboot.bi.demo.girl; +package vboot.extend.module.bi.demo.girl; -import vboot.common.mvc.service.BaseService; +import vboot.core.common.service.BaseService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/demo/student/BiDemoStudent.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudent.java similarity index 63% rename from vboot-extend-bi/src/main/java/vboot/bi/demo/student/BiDemoStudent.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudent.java index 4998112..fa7dad4 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/demo/student/BiDemoStudent.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudent.java @@ -1,6 +1,6 @@ -package vboot.bi.demo.student; +package vboot.extend.module.bi.demo.student; -import vboot.common.mvc.entity.BaseEntity; +import vboot.core.common.entity.BaseEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/demo/student/BiDemoStudentApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentApi.java similarity index 90% rename from vboot-extend-bi/src/main/java/vboot/bi/demo/student/BiDemoStudentApi.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentApi.java index 8672e6d..453e4d9 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/demo/student/BiDemoStudentApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentApi.java @@ -1,7 +1,7 @@ -package vboot.bi.demo.student; +package vboot.extend.module.bi.demo.student; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/demo/student/BiDemoStudentRepo.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentRepo.java similarity index 76% rename from vboot-extend-bi/src/main/java/vboot/bi/demo/student/BiDemoStudentRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentRepo.java index 3f7f377..4343164 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/demo/student/BiDemoStudentRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentRepo.java @@ -1,4 +1,4 @@ -package vboot.bi.demo.student; +package vboot.extend.module.bi.demo.student; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/demo/student/BiDemoStudentService.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentService.java similarity index 83% rename from vboot-extend-bi/src/main/java/vboot/bi/demo/student/BiDemoStudentService.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentService.java index ff4884d..290cf3c 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/demo/student/BiDemoStudentService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentService.java @@ -1,6 +1,6 @@ -package vboot.bi.demo.student; +package vboot.extend.module.bi.demo.student; -import vboot.common.mvc.service.BaseService; +import vboot.core.common.service.BaseService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/etl/log/BiEtlLog.java b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/log/BiEtlLog.java similarity index 95% rename from vboot-extend-bi/src/main/java/vboot/bi/etl/log/BiEtlLog.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/etl/log/BiEtlLog.java index 4a5f5a6..97d23e4 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/etl/log/BiEtlLog.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/log/BiEtlLog.java @@ -1,4 +1,4 @@ -package vboot.bi.etl.log; +package vboot.extend.module.bi.etl.log; import lombok.Getter; import lombok.Setter; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/etl/log/BiEtlLogApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/log/BiEtlLogApi.java similarity index 90% rename from vboot-extend-bi/src/main/java/vboot/bi/etl/log/BiEtlLogApi.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/etl/log/BiEtlLogApi.java index 8df65cb..b185812 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/etl/log/BiEtlLogApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/log/BiEtlLogApi.java @@ -1,8 +1,8 @@ -package vboot.bi.etl.log; +package vboot.extend.module.bi.etl.log; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/etl/main/BiEtlJobListener.java b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlJobListener.java similarity index 96% rename from vboot-extend-bi/src/main/java/vboot/bi/etl/main/BiEtlJobListener.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlJobListener.java index 9b7bd70..540997c 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/etl/main/BiEtlJobListener.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlJobListener.java @@ -1,4 +1,4 @@ -package vboot.bi.etl.main; +package vboot.extend.module.bi.etl.main; import lombok.extern.slf4j.Slf4j; import org.pentaho.di.core.KettleEnvironment; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/etl/main/BiEtlMain.java b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMain.java similarity index 82% rename from vboot-extend-bi/src/main/java/vboot/bi/etl/main/BiEtlMain.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMain.java index 0b5e5bf..542e00d 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/etl/main/BiEtlMain.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMain.java @@ -1,6 +1,6 @@ -package vboot.bi.etl.main; +package vboot.extend.module.bi.etl.main; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/etl/main/BiEtlMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainApi.java similarity index 95% rename from vboot-extend-bi/src/main/java/vboot/bi/etl/main/BiEtlMainApi.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainApi.java index 63f55dd..c22ebf8 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/etl/main/BiEtlMainApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainApi.java @@ -1,7 +1,7 @@ -package vboot.bi.etl.main; +package vboot.extend.module.bi.etl.main; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/etl/main/BiEtlMainHandler.java b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainHandler.java similarity index 98% rename from vboot-extend-bi/src/main/java/vboot/bi/etl/main/BiEtlMainHandler.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainHandler.java index 7bfa0ba..e026330 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/etl/main/BiEtlMainHandler.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainHandler.java @@ -1,4 +1,4 @@ -package vboot.bi.etl.main; +package vboot.extend.module.bi.etl.main; import org.quartz.*; import org.springframework.beans.factory.annotation.Autowired; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/etl/main/BiEtlMainRepo.java b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainRepo.java similarity index 81% rename from vboot-extend-bi/src/main/java/vboot/bi/etl/main/BiEtlMainRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainRepo.java index 3a4cc87..a0ec1a0 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/etl/main/BiEtlMainRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainRepo.java @@ -1,4 +1,4 @@ -package vboot.bi.etl.main; +package vboot.extend.module.bi.etl.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/etl/main/BiEtlMainService.java b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainService.java similarity index 93% rename from vboot-extend-bi/src/main/java/vboot/bi/etl/main/BiEtlMainService.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainService.java index 6a7db38..5793623 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/etl/main/BiEtlMainService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainService.java @@ -1,6 +1,6 @@ -package vboot.bi.etl.main; +package vboot.extend.module.bi.etl.main; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.service.BaseMainService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/etl/main/KetJobFactory.java b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/KetJobFactory.java similarity index 85% rename from vboot-extend-bi/src/main/java/vboot/bi/etl/main/KetJobFactory.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/KetJobFactory.java index 265ef48..c52881f 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/etl/main/KetJobFactory.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/KetJobFactory.java @@ -1,6 +1,6 @@ -package vboot.bi.etl.main; +package vboot.extend.module.bi.etl.main; -import vboot.common.util.web.XspringUtil; +import vboot.core.xutil.web.XspringUtil; import org.quartz.Job; import org.quartz.JobExecutionContext; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/etl/main/KetUtil.java b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/KetUtil.java similarity index 98% rename from vboot-extend-bi/src/main/java/vboot/bi/etl/main/KetUtil.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/KetUtil.java index 594b35d..cb7b210 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/etl/main/KetUtil.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/KetUtil.java @@ -1,4 +1,4 @@ -package vboot.bi.etl.main; +package vboot.extend.module.bi.etl.main; import org.pentaho.di.core.database.DatabaseMeta; import org.pentaho.di.core.logging.KettleLogStore; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/field/main/BiFieldMain.java b/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMain.java similarity index 79% rename from vboot-extend-bi/src/main/java/vboot/bi/field/main/BiFieldMain.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMain.java index 69e9228..ecb0faf 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/field/main/BiFieldMain.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMain.java @@ -1,6 +1,6 @@ -package vboot.bi.field.main; +package vboot.extend.module.bi.field.main; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/field/main/BiFieldMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainApi.java similarity index 90% rename from vboot-extend-bi/src/main/java/vboot/bi/field/main/BiFieldMainApi.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainApi.java index e8d3b01..6cfd18f 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/field/main/BiFieldMainApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainApi.java @@ -1,7 +1,7 @@ -package vboot.bi.field.main; +package vboot.extend.module.bi.field.main; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/field/main/BiFieldMainRepo.java b/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainRepo.java similarity index 77% rename from vboot-extend-bi/src/main/java/vboot/bi/field/main/BiFieldMainRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainRepo.java index 5575695..2ffd6de 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/field/main/BiFieldMainRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainRepo.java @@ -1,4 +1,4 @@ -package vboot.bi.field.main; +package vboot.extend.module.bi.field.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/field/main/BiFieldMainService.java b/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainService.java similarity index 81% rename from vboot-extend-bi/src/main/java/vboot/bi/field/main/BiFieldMainService.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainService.java index f386bef..b8b2e24 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/field/main/BiFieldMainService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainService.java @@ -1,6 +1,6 @@ -package vboot.bi.field.main; +package vboot.extend.module.bi.field.main; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/table/main/BiTableMain.java b/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMain.java similarity index 77% rename from vboot-extend-bi/src/main/java/vboot/bi/table/main/BiTableMain.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMain.java index 0a5b9a1..8556e41 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/table/main/BiTableMain.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMain.java @@ -1,6 +1,6 @@ -package vboot.bi.table.main; +package vboot.extend.module.bi.table.main; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/table/main/BiTableMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainApi.java similarity index 90% rename from vboot-extend-bi/src/main/java/vboot/bi/table/main/BiTableMainApi.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainApi.java index 79f1355..b146be3 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/table/main/BiTableMainApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainApi.java @@ -1,7 +1,7 @@ -package vboot.bi.table.main; +package vboot.extend.module.bi.table.main; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/table/main/BiTableMainRepo.java b/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainRepo.java similarity index 77% rename from vboot-extend-bi/src/main/java/vboot/bi/table/main/BiTableMainRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainRepo.java index ebefb0e..0b6169c 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/table/main/BiTableMainRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainRepo.java @@ -1,4 +1,4 @@ -package vboot.bi.table.main; +package vboot.extend.module.bi.table.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-extend-bi/src/main/java/vboot/bi/table/main/BiTableMainService.java b/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainService.java similarity index 81% rename from vboot-extend-bi/src/main/java/vboot/bi/table/main/BiTableMainService.java rename to vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainService.java index 2e828d0..a389e91 100644 --- a/vboot-extend-bi/src/main/java/vboot/bi/table/main/BiTableMainService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainService.java @@ -1,6 +1,6 @@ -package vboot.bi.table.main; +package vboot.extend.module.bi.table.main; -import vboot.common.mvc.service.BaseMainService; +import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-core/src/main/java/vboot/modulex/oa/flow/cate/OaFlowCate.java b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/cate/OaFlowCate.java similarity index 82% rename from vboot-core/src/main/java/vboot/modulex/oa/flow/cate/OaFlowCate.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/flow/cate/OaFlowCate.java index 0030670..2f5f894 100644 --- a/vboot-core/src/main/java/vboot/modulex/oa/flow/cate/OaFlowCate.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/cate/OaFlowCate.java @@ -1,6 +1,6 @@ -package vboot.modulex.oa.flow.cate; +package vboot.extend.module.oa.flow.cate; -import vboot.common.mvc.entity.BaseCateEntity; +import vboot.core.common.entity.BaseCateEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-core/src/main/java/vboot/modulex/oa/flow/cate/OaFlowCateApi.java b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/cate/OaFlowCateApi.java similarity index 90% rename from vboot-core/src/main/java/vboot/modulex/oa/flow/cate/OaFlowCateApi.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/flow/cate/OaFlowCateApi.java index 263fc5f..53c7e82 100644 --- a/vboot-core/src/main/java/vboot/modulex/oa/flow/cate/OaFlowCateApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/cate/OaFlowCateApi.java @@ -1,8 +1,8 @@ -package vboot.modulex.oa.flow.cate; +package vboot.extend.module.oa.flow.cate; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.pojo.Ztree; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; +import vboot.core.common.pojo.Ztree; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/vboot-core/src/main/java/vboot/modulex/oa/flow/cate/OaFlowCateRepo.java b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/cate/OaFlowCateRepo.java similarity index 77% rename from vboot-core/src/main/java/vboot/modulex/oa/flow/cate/OaFlowCateRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/flow/cate/OaFlowCateRepo.java index 21c7df3..ee0b98f 100644 --- a/vboot-core/src/main/java/vboot/modulex/oa/flow/cate/OaFlowCateRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/cate/OaFlowCateRepo.java @@ -1,4 +1,4 @@ -package vboot.modulex.oa.flow.cate; +package vboot.extend.module.oa.flow.cate; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/modulex/oa/flow/cate/OaFlowCateService.java b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/cate/OaFlowCateService.java similarity index 93% rename from vboot-core/src/main/java/vboot/modulex/oa/flow/cate/OaFlowCateService.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/flow/cate/OaFlowCateService.java index 71e4314..985e68b 100644 --- a/vboot-core/src/main/java/vboot/modulex/oa/flow/cate/OaFlowCateService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/cate/OaFlowCateService.java @@ -1,7 +1,7 @@ -package vboot.modulex.oa.flow.cate; +package vboot.extend.module.oa.flow.cate; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.service.BaseCateService; +import vboot.core.common.dao.Sqler; +import vboot.core.common.service.BaseCateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.stereotype.Service; diff --git a/vboot-core/src/main/java/vboot/modulex/oa/flow/main/OaFlowMain.java b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/main/OaFlowMain.java similarity index 80% rename from vboot-core/src/main/java/vboot/modulex/oa/flow/main/OaFlowMain.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/flow/main/OaFlowMain.java index 7f4aca4..4d2a4ad 100644 --- a/vboot-core/src/main/java/vboot/modulex/oa/flow/main/OaFlowMain.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/main/OaFlowMain.java @@ -1,7 +1,7 @@ -package vboot.modulex.oa.flow.main; +package vboot.extend.module.oa.flow.main; -import vboot.common.mvc.entity.BaseMainEntity; -import vboot.module.bpm.proc.main.Zbpm; +import vboot.core.common.entity.BaseMainEntity; +import vboot.core.module.bpm.proc.main.Zbpm; import lombok.Getter; import lombok.Setter; diff --git a/vboot-core/src/main/java/vboot/modulex/oa/flow/main/OaFlowMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/main/OaFlowMainApi.java similarity index 86% rename from vboot-core/src/main/java/vboot/modulex/oa/flow/main/OaFlowMainApi.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/flow/main/OaFlowMainApi.java index 82806c4..c9b8a1d 100644 --- a/vboot-core/src/main/java/vboot/modulex/oa/flow/main/OaFlowMainApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/main/OaFlowMainApi.java @@ -1,12 +1,12 @@ -package vboot.modulex.oa.flow.main; +package vboot.extend.module.oa.flow.main; -import vboot.common.mvc.api.PageData; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.Sqler; +import vboot.core.common.api.PageData; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.Sqler; import org.dom4j.DocumentException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import vboot.module.bpm.task.main.BpmTaskMainService; +import vboot.core.module.bpm.task.main.BpmTaskMainService; @RestController @RequestMapping("oa/flow/main") diff --git a/vboot-core/src/main/java/vboot/modulex/oa/flow/main/OaFlowMainRepo.java b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/main/OaFlowMainRepo.java similarity index 77% rename from vboot-core/src/main/java/vboot/modulex/oa/flow/main/OaFlowMainRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/flow/main/OaFlowMainRepo.java index e510970..ccd3715 100644 --- a/vboot-core/src/main/java/vboot/modulex/oa/flow/main/OaFlowMainRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/main/OaFlowMainRepo.java @@ -1,4 +1,4 @@ -package vboot.modulex.oa.flow.main; +package vboot.extend.module.oa.flow.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/modulex/oa/flow/main/OaFlowMainService.java b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/main/OaFlowMainService.java similarity index 86% rename from vboot-core/src/main/java/vboot/modulex/oa/flow/main/OaFlowMainService.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/flow/main/OaFlowMainService.java index 24b9d5a..ce38ec5 100644 --- a/vboot-core/src/main/java/vboot/modulex/oa/flow/main/OaFlowMainService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/main/OaFlowMainService.java @@ -1,11 +1,11 @@ -package vboot.modulex.oa.flow.main; +package vboot.extend.module.oa.flow.main; -import vboot.common.mvc.service.BaseMainService; -import vboot.module.bpm.proc.main.BpmProcMainService; -import vboot.module.bpm.proc.main.Zbpm; +import vboot.core.common.service.BaseMainService; +import vboot.core.module.bpm.proc.main.BpmProcMainService; +import vboot.core.module.bpm.proc.main.Zbpm; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import vboot.module.bpm.proc.main.Znode; +import vboot.core.module.bpm.proc.main.Znode; import javax.annotation.PostConstruct; import java.util.Date; @@ -31,6 +31,7 @@ public class OaFlowMainService extends BaseMainService { } public void updatex(OaFlowMain oaFlowMain) { + oaFlowMain.setState("20"); super.update(oaFlowMain); if ("pass".equals(oaFlowMain.getZbpm().getOpkey())) { Znode znode = procService.handlerPass(oaFlowMain.getZbpm()); diff --git a/vboot-core/src/main/java/vboot/modulex/oa/flow/rece/OaFlowRece.java b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/rece/OaFlowRece.java similarity index 91% rename from vboot-core/src/main/java/vboot/modulex/oa/flow/rece/OaFlowRece.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/flow/rece/OaFlowRece.java index f63e0ee..a043c93 100644 --- a/vboot-core/src/main/java/vboot/modulex/oa/flow/rece/OaFlowRece.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/rece/OaFlowRece.java @@ -1,4 +1,4 @@ -package vboot.modulex.oa.flow.rece; +package vboot.extend.module.oa.flow.rece; import lombok.Data; diff --git a/vboot-core/src/main/java/vboot/modulex/oa/flow/rece/OaFlowReceApi.java b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/rece/OaFlowReceApi.java similarity index 83% rename from vboot-core/src/main/java/vboot/modulex/oa/flow/rece/OaFlowReceApi.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/flow/rece/OaFlowReceApi.java index 47c3e0e..30f6f0f 100644 --- a/vboot-core/src/main/java/vboot/modulex/oa/flow/rece/OaFlowReceApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/rece/OaFlowReceApi.java @@ -1,12 +1,11 @@ -package vboot.modulex.oa.flow.rece; +package vboot.extend.module.oa.flow.rece; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.util.web.XuserUtil; -import vboot.module.sys.org.rece.SysOrgRece; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.xutil.web.XuserUtil; import java.sql.SQLException; import java.util.ArrayList; diff --git a/vboot-core/src/main/java/vboot/modulex/oa/flow/rece/OaFlowReceRepo.java b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/rece/OaFlowReceRepo.java similarity index 77% rename from vboot-core/src/main/java/vboot/modulex/oa/flow/rece/OaFlowReceRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/flow/rece/OaFlowReceRepo.java index 1f59e96..26a9a7b 100644 --- a/vboot-core/src/main/java/vboot/modulex/oa/flow/rece/OaFlowReceRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/rece/OaFlowReceRepo.java @@ -1,4 +1,4 @@ -package vboot.modulex.oa.flow.rece; +package vboot.extend.module.oa.flow.rece; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/modulex/oa/flow/rece/OaFlowReceService.java b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/rece/OaFlowReceService.java similarity index 81% rename from vboot-core/src/main/java/vboot/modulex/oa/flow/rece/OaFlowReceService.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/flow/rece/OaFlowReceService.java index 3eebec8..95cc35e 100644 --- a/vboot-core/src/main/java/vboot/modulex/oa/flow/rece/OaFlowReceService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/rece/OaFlowReceService.java @@ -1,20 +1,15 @@ -package vboot.modulex.oa.flow.rece; +package vboot.extend.module.oa.flow.rece; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import vboot.common.mvc.api.PageData; -import vboot.common.mvc.dao.Dsqler; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.util.lang.XstringUtil; -import vboot.common.util.web.XuserUtil; -import vboot.module.sys.org.rece.SysOrgRece; -import vboot.module.sys.org.rece.SysOrgReceRepo; +import vboot.core.common.dao.Dsqler; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.xutil.lang.XstringUtil; +import vboot.core.xutil.web.XuserUtil; import java.sql.SQLException; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/vboot-core/src/main/java/vboot/modulex/oa/flow/temp/OaFlowTemp.java b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/temp/OaFlowTemp.java similarity index 71% rename from vboot-core/src/main/java/vboot/modulex/oa/flow/temp/OaFlowTemp.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/flow/temp/OaFlowTemp.java index 452f916..2a74bc7 100644 --- a/vboot-core/src/main/java/vboot/modulex/oa/flow/temp/OaFlowTemp.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/temp/OaFlowTemp.java @@ -1,10 +1,9 @@ -package vboot.modulex.oa.flow.temp; +package vboot.extend.module.oa.flow.temp; -import vboot.common.mvc.entity.BaseMainEntity; +import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; -import vboot.module.sys.org.root.SysOrg; -import vboot.modulex.oa.flow.cate.OaFlowCate; +import vboot.extend.module.oa.flow.cate.OaFlowCate; import javax.persistence.*; diff --git a/vboot-core/src/main/java/vboot/modulex/oa/flow/temp/OaFlowTempApi.java b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/temp/OaFlowTempApi.java similarity index 90% rename from vboot-core/src/main/java/vboot/modulex/oa/flow/temp/OaFlowTempApi.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/flow/temp/OaFlowTempApi.java index 26d8da0..06a7755 100644 --- a/vboot-core/src/main/java/vboot/modulex/oa/flow/temp/OaFlowTempApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/temp/OaFlowTempApi.java @@ -1,13 +1,13 @@ -package vboot.modulex.oa.flow.temp; +package vboot.extend.module.oa.flow.temp; -import vboot.common.mvc.api.RestResult; -import vboot.common.mvc.dao.JdbcDao; -import vboot.common.mvc.dao.Sqler; -import vboot.common.mvc.pojo.Zinp; +import vboot.core.common.api.RestResult; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.common.pojo.Zinp; import org.dom4j.DocumentException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import vboot.common.util.lang.XstringUtil; +import vboot.core.xutil.lang.XstringUtil; import java.util.List; import java.util.Map; diff --git a/vboot-core/src/main/java/vboot/modulex/oa/flow/temp/OaFlowTempRepo.java b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/temp/OaFlowTempRepo.java similarity index 77% rename from vboot-core/src/main/java/vboot/modulex/oa/flow/temp/OaFlowTempRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/flow/temp/OaFlowTempRepo.java index 5e6b07c..f917b74 100644 --- a/vboot-core/src/main/java/vboot/modulex/oa/flow/temp/OaFlowTempRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/temp/OaFlowTempRepo.java @@ -1,4 +1,4 @@ -package vboot.modulex.oa.flow.temp; +package vboot.extend.module.oa.flow.temp; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-core/src/main/java/vboot/modulex/oa/flow/temp/OaFlowTempService.java b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/temp/OaFlowTempService.java similarity index 93% rename from vboot-core/src/main/java/vboot/modulex/oa/flow/temp/OaFlowTempService.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/flow/temp/OaFlowTempService.java index ec987de..d088cca 100644 --- a/vboot-core/src/main/java/vboot/modulex/oa/flow/temp/OaFlowTempService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/temp/OaFlowTempService.java @@ -1,9 +1,9 @@ -package vboot.modulex.oa.flow.temp; +package vboot.extend.module.oa.flow.temp; -import vboot.common.mvc.pojo.Zinp; -import vboot.common.mvc.service.BaseMainService; -import vboot.module.bpm.proc.temp.BpmProcTemp; -import vboot.module.bpm.proc.temp.BpmProcTempService; +import vboot.core.common.pojo.Zinp; +import vboot.core.common.service.BaseMainService; +import vboot.core.module.bpm.proc.temp.BpmProcTemp; +import vboot.core.module.bpm.proc.temp.BpmProcTempService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-web/pom.xml b/vboot-web/pom.xml new file mode 100644 index 0000000..7ca6488 --- /dev/null +++ b/vboot-web/pom.xml @@ -0,0 +1,59 @@ + + + + vboot + com.zsvg + 0.1 + + 4.0.0 + + vboot-web + + + + com.zsvg + vboot-application + ${vboot.version} + + + + mysql + mysql-connector-java + 5.1.49 + + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + true + + + + + + + + repackage + + + + + + + + \ No newline at end of file diff --git a/vboot-application/src/main/java/com/abc/Application.java b/vboot-web/src/main/java/vboot/Application.java similarity index 84% rename from vboot-application/src/main/java/com/abc/Application.java rename to vboot-web/src/main/java/vboot/Application.java index 443f076..0a311b3 100644 --- a/vboot-application/src/main/java/com/abc/Application.java +++ b/vboot-web/src/main/java/vboot/Application.java @@ -1,15 +1,13 @@ -package com.abc; +package vboot; -import vboot.common.util.lang.XstringUtil; -import vboot.common.util.web.XspringUtil; +import vboot.core.xutil.lang.XstringUtil; +import vboot.core.xutil.web.XspringUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.ComponentScan; import org.springframework.core.env.Environment; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.scheduling.annotation.EnableAsync; import java.net.InetAddress; @@ -17,8 +15,8 @@ import java.net.UnknownHostException; @EnableCaching @SpringBootApplication -@ComponentScan({"vboot","com.abc"}) -@EnableJpaRepositories({"vboot","com.abc"}) +//@ComponentScan({"vboot"}) +//@EnableJpaRepositories({"vboot"}) @Slf4j @EnableAsync //@EnableSwagger2 diff --git a/vboot-application/src/main/resources/META-INF/MANIFEST.MF b/vboot-web/src/main/resources/META-INF/MANIFEST.MF similarity index 99% rename from vboot-application/src/main/resources/META-INF/MANIFEST.MF rename to vboot-web/src/main/resources/META-INF/MANIFEST.MF index 40508a0..6044a35 100644 --- a/vboot-application/src/main/resources/META-INF/MANIFEST.MF +++ b/vboot-web/src/main/resources/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 -Main-Class: com.abc.Application +Main-Class: vboot.Application Class-Path: hibernate-core-5.4.27.Final.jar prefixmap-2.0.jar json-lib-2 .2.3-jdk15.jar tomcat-embed-core-9.0.41.jar spring-expression-5.2.12.RE LEASE.jar spring-boot-autoconfigure-2.2.13.RELEASE.jar spring-data-comm diff --git a/vboot-application/src/main/resources/application.properties b/vboot-web/src/main/resources/application.properties similarity index 99% rename from vboot-application/src/main/resources/application.properties rename to vboot-web/src/main/resources/application.properties index ac4494a..5731600 100644 --- a/vboot-application/src/main/resources/application.properties +++ b/vboot-web/src/main/resources/application.properties @@ -1,6 +1,6 @@ #web\u914D\u7F6E -server.port=5000 -#server.port=5301 +#server.port=5000 +server.port=5301 spring.servlet.multipart.max-file-size=10240000 spring.servlet.multipart.max-request-size=10240000 server.compression.enabled=true diff --git a/vboot-application/src/main/resources/application.yml b/vboot-web/src/main/resources/application.yml similarity index 100% rename from vboot-application/src/main/resources/application.yml rename to vboot-web/src/main/resources/application.yml diff --git a/vboot-application/src/main/resources/config/banner.txt b/vboot-web/src/main/resources/config/banner.txt similarity index 100% rename from vboot-application/src/main/resources/config/banner.txt rename to vboot-web/src/main/resources/config/banner.txt diff --git a/vboot-application/src/main/resources/config/logback.xml b/vboot-web/src/main/resources/config/logback.xml similarity index 100% rename from vboot-application/src/main/resources/config/logback.xml rename to vboot-web/src/main/resources/config/logback.xml diff --git a/vboot-application/src/main/resources/config/sap-config.properties b/vboot-web/src/main/resources/config/sap-config.properties similarity index 100% rename from vboot-application/src/main/resources/config/sap-config.properties rename to vboot-web/src/main/resources/config/sap-config.properties diff --git a/vboot-application/src/main/resources/static/assets/401.1653003640069.css b/vboot-web/src/main/resources/static/assets/401.1653003640069.css similarity index 100% rename from vboot-application/src/main/resources/static/assets/401.1653003640069.css rename to vboot-web/src/main/resources/static/assets/401.1653003640069.css diff --git a/vboot-application/src/main/resources/static/assets/401.1653003640069.js b/vboot-web/src/main/resources/static/assets/401.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/401.1653003640069.js rename to vboot-web/src/main/resources/static/assets/401.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/404.1653003640069.css b/vboot-web/src/main/resources/static/assets/404.1653003640069.css similarity index 100% rename from vboot-application/src/main/resources/static/assets/404.1653003640069.css rename to vboot-web/src/main/resources/static/assets/404.1653003640069.css diff --git a/vboot-application/src/main/resources/static/assets/404.1653003640069.js b/vboot-web/src/main/resources/static/assets/404.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/404.1653003640069.js rename to vboot-web/src/main/resources/static/assets/404.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/DeptTree.1653003640069.css b/vboot-web/src/main/resources/static/assets/DeptTree.1653003640069.css similarity index 100% rename from vboot-application/src/main/resources/static/assets/DeptTree.1653003640069.css rename to vboot-web/src/main/resources/static/assets/DeptTree.1653003640069.css diff --git a/vboot-application/src/main/resources/static/assets/DeptTree.1653003640069.js b/vboot-web/src/main/resources/static/assets/DeptTree.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/DeptTree.1653003640069.js rename to vboot-web/src/main/resources/static/assets/DeptTree.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/Event.1653003640069.js b/vboot-web/src/main/resources/static/assets/Event.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/Event.1653003640069.js rename to vboot-web/src/main/resources/static/assets/Event.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/Flow.1653003640069.js b/vboot-web/src/main/resources/static/assets/Flow.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/Flow.1653003640069.js rename to vboot-web/src/main/resources/static/assets/Flow.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/FlowModal.1653003640069.css b/vboot-web/src/main/resources/static/assets/FlowModal.1653003640069.css similarity index 100% rename from vboot-application/src/main/resources/static/assets/FlowModal.1653003640069.css rename to vboot-web/src/main/resources/static/assets/FlowModal.1653003640069.css diff --git a/vboot-application/src/main/resources/static/assets/FlowModal.1653003640069.js b/vboot-web/src/main/resources/static/assets/FlowModal.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/FlowModal.1653003640069.js rename to vboot-web/src/main/resources/static/assets/FlowModal.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/Gateway.1653003640069.js b/vboot-web/src/main/resources/static/assets/Gateway.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/Gateway.1653003640069.js rename to vboot-web/src/main/resources/static/assets/Gateway.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/GenModal.1653003640069.css b/vboot-web/src/main/resources/static/assets/GenModal.1653003640069.css similarity index 100% rename from vboot-application/src/main/resources/static/assets/GenModal.1653003640069.css rename to vboot-web/src/main/resources/static/assets/GenModal.1653003640069.css diff --git a/vboot-application/src/main/resources/static/assets/GenModal.1653003640069.js b/vboot-web/src/main/resources/static/assets/GenModal.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/GenModal.1653003640069.js rename to vboot-web/src/main/resources/static/assets/GenModal.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/GenTree.1653003640069.css b/vboot-web/src/main/resources/static/assets/GenTree.1653003640069.css similarity index 100% rename from vboot-application/src/main/resources/static/assets/GenTree.1653003640069.css rename to vboot-web/src/main/resources/static/assets/GenTree.1653003640069.css diff --git a/vboot-application/src/main/resources/static/assets/GenTree.1653003640069.js b/vboot-web/src/main/resources/static/assets/GenTree.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/GenTree.1653003640069.js rename to vboot-web/src/main/resources/static/assets/GenTree.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/OrgModal.1653003640069.css b/vboot-web/src/main/resources/static/assets/OrgModal.1653003640069.css similarity index 100% rename from vboot-application/src/main/resources/static/assets/OrgModal.1653003640069.css rename to vboot-web/src/main/resources/static/assets/OrgModal.1653003640069.css diff --git a/vboot-application/src/main/resources/static/assets/OrgModal.1653003640069.js b/vboot-web/src/main/resources/static/assets/OrgModal.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/OrgModal.1653003640069.js rename to vboot-web/src/main/resources/static/assets/OrgModal.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/Other.1653003640069.js b/vboot-web/src/main/resources/static/assets/Other.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/Other.1653003640069.js rename to vboot-web/src/main/resources/static/assets/Other.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/PrefixLabelSelect.1653003640069.css b/vboot-web/src/main/resources/static/assets/PrefixLabelSelect.1653003640069.css similarity index 100% rename from vboot-application/src/main/resources/static/assets/PrefixLabelSelect.1653003640069.css rename to vboot-web/src/main/resources/static/assets/PrefixLabelSelect.1653003640069.css diff --git a/vboot-application/src/main/resources/static/assets/PrefixLabelSelect.1653003640069.js b/vboot-web/src/main/resources/static/assets/PrefixLabelSelect.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/PrefixLabelSelect.1653003640069.js rename to vboot-web/src/main/resources/static/assets/PrefixLabelSelect.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/Process.1653003640069.js b/vboot-web/src/main/resources/static/assets/Process.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/Process.1653003640069.js rename to vboot-web/src/main/resources/static/assets/Process.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/Task.1653003640069.js b/vboot-web/src/main/resources/static/assets/Task.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/Task.1653003640069.js rename to vboot-web/src/main/resources/static/assets/Task.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/Wrap.1653003640069.js b/vboot-web/src/main/resources/static/assets/Wrap.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/Wrap.1653003640069.js rename to vboot-web/src/main/resources/static/assets/Wrap.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/aside.1653003640069.js b/vboot-web/src/main/resources/static/assets/aside.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/aside.1653003640069.js rename to vboot-web/src/main/resources/static/assets/aside.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/bathymetry.1653003640069.jpg b/vboot-web/src/main/resources/static/assets/bathymetry.1653003640069.jpg similarity index 100% rename from vboot-application/src/main/resources/static/assets/bathymetry.1653003640069.jpg rename to vboot-web/src/main/resources/static/assets/bathymetry.1653003640069.jpg diff --git a/vboot-application/src/main/resources/static/assets/bpmn.1653003640069.eot b/vboot-web/src/main/resources/static/assets/bpmn.1653003640069.eot similarity index 100% rename from vboot-application/src/main/resources/static/assets/bpmn.1653003640069.eot rename to vboot-web/src/main/resources/static/assets/bpmn.1653003640069.eot diff --git a/vboot-application/src/main/resources/static/assets/bpmn.1653003640069.svg b/vboot-web/src/main/resources/static/assets/bpmn.1653003640069.svg similarity index 100% rename from vboot-application/src/main/resources/static/assets/bpmn.1653003640069.svg rename to vboot-web/src/main/resources/static/assets/bpmn.1653003640069.svg diff --git a/vboot-application/src/main/resources/static/assets/bpmn.1653003640069.ttf b/vboot-web/src/main/resources/static/assets/bpmn.1653003640069.ttf similarity index 100% rename from vboot-application/src/main/resources/static/assets/bpmn.1653003640069.ttf rename to vboot-web/src/main/resources/static/assets/bpmn.1653003640069.ttf diff --git a/vboot-application/src/main/resources/static/assets/bpmn.1653003640069.woff b/vboot-web/src/main/resources/static/assets/bpmn.1653003640069.woff similarity index 100% rename from vboot-application/src/main/resources/static/assets/bpmn.1653003640069.woff rename to vboot-web/src/main/resources/static/assets/bpmn.1653003640069.woff diff --git a/vboot-application/src/main/resources/static/assets/bpmn.1653003640069.woff2 b/vboot-web/src/main/resources/static/assets/bpmn.1653003640069.woff2 similarity index 100% rename from vboot-application/src/main/resources/static/assets/bpmn.1653003640069.woff2 rename to vboot-web/src/main/resources/static/assets/bpmn.1653003640069.woff2 diff --git a/vboot-application/src/main/resources/static/assets/classic.1653003640069.js b/vboot-web/src/main/resources/static/assets/classic.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/classic.1653003640069.js rename to vboot-web/src/main/resources/static/assets/classic.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/columns.1653003640069.css b/vboot-web/src/main/resources/static/assets/columns.1653003640069.css similarity index 100% rename from vboot-application/src/main/resources/static/assets/columns.1653003640069.css rename to vboot-web/src/main/resources/static/assets/columns.1653003640069.css diff --git a/vboot-application/src/main/resources/static/assets/columns.1653003640069.js b/vboot-web/src/main/resources/static/assets/columns.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/columns.1653003640069.js rename to vboot-web/src/main/resources/static/assets/columns.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/common.1653003640069.css b/vboot-web/src/main/resources/static/assets/common.1653003640069.css similarity index 100% rename from vboot-application/src/main/resources/static/assets/common.1653003640069.css rename to vboot-web/src/main/resources/static/assets/common.1653003640069.css diff --git a/vboot-application/src/main/resources/static/assets/common.1653003640069.js b/vboot-web/src/main/resources/static/assets/common.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/common.1653003640069.js rename to vboot-web/src/main/resources/static/assets/common.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/defaults.1653003640069.js b/vboot-web/src/main/resources/static/assets/defaults.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/defaults.1653003640069.js rename to vboot-web/src/main/resources/static/assets/defaults.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/demo1.1653003640069.css b/vboot-web/src/main/resources/static/assets/demo1.1653003640069.css similarity index 100% rename from vboot-application/src/main/resources/static/assets/demo1.1653003640069.css rename to vboot-web/src/main/resources/static/assets/demo1.1653003640069.css diff --git a/vboot-application/src/main/resources/static/assets/demo1.1653003640069.js b/vboot-web/src/main/resources/static/assets/demo1.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/demo1.1653003640069.js rename to vboot-web/src/main/resources/static/assets/demo1.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/demo2.1653003640069.css b/vboot-web/src/main/resources/static/assets/demo2.1653003640069.css similarity index 100% rename from vboot-application/src/main/resources/static/assets/demo2.1653003640069.css rename to vboot-web/src/main/resources/static/assets/demo2.1653003640069.css diff --git a/vboot-application/src/main/resources/static/assets/demo2.1653003640069.js b/vboot-web/src/main/resources/static/assets/demo2.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/demo2.1653003640069.js rename to vboot-web/src/main/resources/static/assets/demo2.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/echarts.1653003640069.js b/vboot-web/src/main/resources/static/assets/echarts.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/echarts.1653003640069.js rename to vboot-web/src/main/resources/static/assets/echarts.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/edit.1653003640069.css b/vboot-web/src/main/resources/static/assets/edit.1653003640069.css similarity index 100% rename from vboot-application/src/main/resources/static/assets/edit.1653003640069.css rename to vboot-web/src/main/resources/static/assets/edit.1653003640069.css diff --git a/vboot-application/src/main/resources/static/assets/edit.1653003640069.js b/vboot-web/src/main/resources/static/assets/edit.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/edit.1653003640069.js rename to vboot-web/src/main/resources/static/assets/edit.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/edit.165300364006910.js b/vboot-web/src/main/resources/static/assets/edit.165300364006910.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/edit.165300364006910.js rename to vboot-web/src/main/resources/static/assets/edit.165300364006910.js diff --git a/vboot-application/src/main/resources/static/assets/edit.165300364006911.js b/vboot-web/src/main/resources/static/assets/edit.165300364006911.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/edit.165300364006911.js rename to vboot-web/src/main/resources/static/assets/edit.165300364006911.js diff --git a/vboot-application/src/main/resources/static/assets/edit.165300364006912.js b/vboot-web/src/main/resources/static/assets/edit.165300364006912.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/edit.165300364006912.js rename to vboot-web/src/main/resources/static/assets/edit.165300364006912.js diff --git a/vboot-application/src/main/resources/static/assets/edit.165300364006913.js b/vboot-web/src/main/resources/static/assets/edit.165300364006913.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/edit.165300364006913.js rename to vboot-web/src/main/resources/static/assets/edit.165300364006913.js diff --git a/vboot-application/src/main/resources/static/assets/edit.16530036400692.js b/vboot-web/src/main/resources/static/assets/edit.16530036400692.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/edit.16530036400692.js rename to vboot-web/src/main/resources/static/assets/edit.16530036400692.js diff --git a/vboot-application/src/main/resources/static/assets/edit.16530036400693.js b/vboot-web/src/main/resources/static/assets/edit.16530036400693.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/edit.16530036400693.js rename to vboot-web/src/main/resources/static/assets/edit.16530036400693.js diff --git a/vboot-application/src/main/resources/static/assets/edit.16530036400694.js b/vboot-web/src/main/resources/static/assets/edit.16530036400694.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/edit.16530036400694.js rename to vboot-web/src/main/resources/static/assets/edit.16530036400694.js diff --git a/vboot-application/src/main/resources/static/assets/edit.16530036400695.js b/vboot-web/src/main/resources/static/assets/edit.16530036400695.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/edit.16530036400695.js rename to vboot-web/src/main/resources/static/assets/edit.16530036400695.js diff --git a/vboot-application/src/main/resources/static/assets/edit.16530036400696.js b/vboot-web/src/main/resources/static/assets/edit.16530036400696.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/edit.16530036400696.js rename to vboot-web/src/main/resources/static/assets/edit.16530036400696.js diff --git a/vboot-application/src/main/resources/static/assets/edit.16530036400697.js b/vboot-web/src/main/resources/static/assets/edit.16530036400697.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/edit.16530036400697.js rename to vboot-web/src/main/resources/static/assets/edit.16530036400697.js diff --git a/vboot-application/src/main/resources/static/assets/edit.16530036400698.js b/vboot-web/src/main/resources/static/assets/edit.16530036400698.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/edit.16530036400698.js rename to vboot-web/src/main/resources/static/assets/edit.16530036400698.js diff --git a/vboot-application/src/main/resources/static/assets/edit.16530036400699.js b/vboot-web/src/main/resources/static/assets/edit.16530036400699.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/edit.16530036400699.js rename to vboot-web/src/main/resources/static/assets/edit.16530036400699.js diff --git a/vboot-application/src/main/resources/static/assets/iframes.1653003640069.js b/vboot-web/src/main/resources/static/assets/iframes.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/iframes.1653003640069.js rename to vboot-web/src/main/resources/static/assets/iframes.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/index.1653003640069.css b/vboot-web/src/main/resources/static/assets/index.1653003640069.css similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.1653003640069.css rename to vboot-web/src/main/resources/static/assets/index.1653003640069.css diff --git a/vboot-application/src/main/resources/static/assets/index.1653003640069.js b/vboot-web/src/main/resources/static/assets/index.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.1653003640069.js rename to vboot-web/src/main/resources/static/assets/index.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/index.165300364006910.js b/vboot-web/src/main/resources/static/assets/index.165300364006910.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.165300364006910.js rename to vboot-web/src/main/resources/static/assets/index.165300364006910.js diff --git a/vboot-application/src/main/resources/static/assets/index.165300364006911.js b/vboot-web/src/main/resources/static/assets/index.165300364006911.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.165300364006911.js rename to vboot-web/src/main/resources/static/assets/index.165300364006911.js diff --git a/vboot-application/src/main/resources/static/assets/index.165300364006912.js b/vboot-web/src/main/resources/static/assets/index.165300364006912.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.165300364006912.js rename to vboot-web/src/main/resources/static/assets/index.165300364006912.js diff --git a/vboot-application/src/main/resources/static/assets/index.165300364006913.js b/vboot-web/src/main/resources/static/assets/index.165300364006913.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.165300364006913.js rename to vboot-web/src/main/resources/static/assets/index.165300364006913.js diff --git a/vboot-application/src/main/resources/static/assets/index.165300364006914.js b/vboot-web/src/main/resources/static/assets/index.165300364006914.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.165300364006914.js rename to vboot-web/src/main/resources/static/assets/index.165300364006914.js diff --git a/vboot-application/src/main/resources/static/assets/index.165300364006915.js b/vboot-web/src/main/resources/static/assets/index.165300364006915.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.165300364006915.js rename to vboot-web/src/main/resources/static/assets/index.165300364006915.js diff --git a/vboot-application/src/main/resources/static/assets/index.165300364006916.js b/vboot-web/src/main/resources/static/assets/index.165300364006916.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.165300364006916.js rename to vboot-web/src/main/resources/static/assets/index.165300364006916.js diff --git a/vboot-application/src/main/resources/static/assets/index.165300364006917.js b/vboot-web/src/main/resources/static/assets/index.165300364006917.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.165300364006917.js rename to vboot-web/src/main/resources/static/assets/index.165300364006917.js diff --git a/vboot-application/src/main/resources/static/assets/index.165300364006918.js b/vboot-web/src/main/resources/static/assets/index.165300364006918.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.165300364006918.js rename to vboot-web/src/main/resources/static/assets/index.165300364006918.js diff --git a/vboot-application/src/main/resources/static/assets/index.165300364006919.js b/vboot-web/src/main/resources/static/assets/index.165300364006919.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.165300364006919.js rename to vboot-web/src/main/resources/static/assets/index.165300364006919.js diff --git a/vboot-application/src/main/resources/static/assets/index.16530036400692.css b/vboot-web/src/main/resources/static/assets/index.16530036400692.css similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.16530036400692.css rename to vboot-web/src/main/resources/static/assets/index.16530036400692.css diff --git a/vboot-application/src/main/resources/static/assets/index.16530036400692.js b/vboot-web/src/main/resources/static/assets/index.16530036400692.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.16530036400692.js rename to vboot-web/src/main/resources/static/assets/index.16530036400692.js diff --git a/vboot-application/src/main/resources/static/assets/index.16530036400693.css b/vboot-web/src/main/resources/static/assets/index.16530036400693.css similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.16530036400693.css rename to vboot-web/src/main/resources/static/assets/index.16530036400693.css diff --git a/vboot-application/src/main/resources/static/assets/index.16530036400693.js b/vboot-web/src/main/resources/static/assets/index.16530036400693.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.16530036400693.js rename to vboot-web/src/main/resources/static/assets/index.16530036400693.js diff --git a/vboot-application/src/main/resources/static/assets/index.16530036400694.js b/vboot-web/src/main/resources/static/assets/index.16530036400694.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.16530036400694.js rename to vboot-web/src/main/resources/static/assets/index.16530036400694.js diff --git a/vboot-application/src/main/resources/static/assets/index.16530036400695.js b/vboot-web/src/main/resources/static/assets/index.16530036400695.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.16530036400695.js rename to vboot-web/src/main/resources/static/assets/index.16530036400695.js diff --git a/vboot-application/src/main/resources/static/assets/index.16530036400696.js b/vboot-web/src/main/resources/static/assets/index.16530036400696.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.16530036400696.js rename to vboot-web/src/main/resources/static/assets/index.16530036400696.js diff --git a/vboot-application/src/main/resources/static/assets/index.16530036400697.js b/vboot-web/src/main/resources/static/assets/index.16530036400697.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.16530036400697.js rename to vboot-web/src/main/resources/static/assets/index.16530036400697.js diff --git a/vboot-application/src/main/resources/static/assets/index.16530036400698.js b/vboot-web/src/main/resources/static/assets/index.16530036400698.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.16530036400698.js rename to vboot-web/src/main/resources/static/assets/index.16530036400698.js diff --git a/vboot-application/src/main/resources/static/assets/index.16530036400699.js b/vboot-web/src/main/resources/static/assets/index.16530036400699.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/index.16530036400699.js rename to vboot-web/src/main/resources/static/assets/index.16530036400699.js diff --git a/vboot-application/src/main/resources/static/assets/link.1653003640069.js b/vboot-web/src/main/resources/static/assets/link.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/link.1653003640069.js rename to vboot-web/src/main/resources/static/assets/link.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/login-icon-two.1653003640069.svg b/vboot-web/src/main/resources/static/assets/login-icon-two.1653003640069.svg similarity index 100% rename from vboot-application/src/main/resources/static/assets/login-icon-two.1653003640069.svg rename to vboot-web/src/main/resources/static/assets/login-icon-two.1653003640069.svg diff --git a/vboot-application/src/main/resources/static/assets/logo-mini.1653003640069.js b/vboot-web/src/main/resources/static/assets/logo-mini.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/logo-mini.1653003640069.js rename to vboot-web/src/main/resources/static/assets/logo-mini.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/logo-mini.1653003640069.svg b/vboot-web/src/main/resources/static/assets/logo-mini.1653003640069.svg similarity index 100% rename from vboot-application/src/main/resources/static/assets/logo-mini.1653003640069.svg rename to vboot-web/src/main/resources/static/assets/logo-mini.1653003640069.svg diff --git a/vboot-application/src/main/resources/static/assets/main.1653003640069.css b/vboot-web/src/main/resources/static/assets/main.1653003640069.css similarity index 100% rename from vboot-application/src/main/resources/static/assets/main.1653003640069.css rename to vboot-web/src/main/resources/static/assets/main.1653003640069.css diff --git a/vboot-application/src/main/resources/static/assets/main.1653003640069.js b/vboot-web/src/main/resources/static/assets/main.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/main.1653003640069.js rename to vboot-web/src/main/resources/static/assets/main.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/parent.1653003640069.js b/vboot-web/src/main/resources/static/assets/parent.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/parent.1653003640069.js rename to vboot-web/src/main/resources/static/assets/parent.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/store.1653003640069.js b/vboot-web/src/main/resources/static/assets/store.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/store.1653003640069.js rename to vboot-web/src/main/resources/static/assets/store.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/translate.1653003640069.css b/vboot-web/src/main/resources/static/assets/translate.1653003640069.css similarity index 100% rename from vboot-application/src/main/resources/static/assets/translate.1653003640069.css rename to vboot-web/src/main/resources/static/assets/translate.1653003640069.css diff --git a/vboot-application/src/main/resources/static/assets/translate.1653003640069.js b/vboot-web/src/main/resources/static/assets/translate.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/translate.1653003640069.js rename to vboot-web/src/main/resources/static/assets/translate.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/transverse.1653003640069.js b/vboot-web/src/main/resources/static/assets/transverse.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/transverse.1653003640069.js rename to vboot-web/src/main/resources/static/assets/transverse.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/view.1653003640069.css b/vboot-web/src/main/resources/static/assets/view.1653003640069.css similarity index 100% rename from vboot-application/src/main/resources/static/assets/view.1653003640069.css rename to vboot-web/src/main/resources/static/assets/view.1653003640069.css diff --git a/vboot-application/src/main/resources/static/assets/view.1653003640069.js b/vboot-web/src/main/resources/static/assets/view.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/view.1653003640069.js rename to vboot-web/src/main/resources/static/assets/view.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/view.16530036400692.js b/vboot-web/src/main/resources/static/assets/view.16530036400692.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/view.16530036400692.js rename to vboot-web/src/main/resources/static/assets/view.16530036400692.js diff --git a/vboot-application/src/main/resources/static/assets/vue.1653003640069.js b/vboot-web/src/main/resources/static/assets/vue.1653003640069.js similarity index 100% rename from vboot-application/src/main/resources/static/assets/vue.1653003640069.js rename to vboot-web/src/main/resources/static/assets/vue.1653003640069.js diff --git a/vboot-application/src/main/resources/static/assets/world.1653003640069.jpg b/vboot-web/src/main/resources/static/assets/world.1653003640069.jpg similarity index 100% rename from vboot-application/src/main/resources/static/assets/world.1653003640069.jpg rename to vboot-web/src/main/resources/static/assets/world.1653003640069.jpg diff --git a/vboot-application/src/main/resources/static/favicon.ico b/vboot-web/src/main/resources/static/favicon.ico similarity index 100% rename from vboot-application/src/main/resources/static/favicon.ico rename to vboot-web/src/main/resources/static/favicon.ico diff --git a/vboot-application/src/main/resources/static/vue.html b/vboot-web/src/main/resources/static/vue.html similarity index 100% rename from vboot-application/src/main/resources/static/vue.html rename to vboot-web/src/main/resources/static/vue.html diff --git a/vboot-application/src/test/java/com/abc/test/wc/WcTest.java b/vboot-web/src/test/java/vboot/test/WcTest.java similarity index 95% rename from vboot-application/src/test/java/com/abc/test/wc/WcTest.java rename to vboot-web/src/test/java/vboot/test/WcTest.java index eee4977..cbe85b4 100644 --- a/vboot-application/src/test/java/com/abc/test/wc/WcTest.java +++ b/vboot-web/src/test/java/vboot/test/WcTest.java @@ -1,9 +1,9 @@ -package com.abc.test.wc; +package vboot.test; -import com.abc.module.wc.palyer.main.WcPlayer; -import com.abc.module.wc.palyer.main.WcPlayerRepo; -import com.abc.module.wc.palyer.main.WcPlayerService; -import vboot.common.util.lang.XnumberUtil; +import vboot.app.module.wc.palyer.main.WcPlayer; +import vboot.app.module.wc.palyer.main.WcPlayerRepo; +import vboot.app.module.wc.palyer.main.WcPlayerService; +import vboot.core.xutil.lang.XnumberUtil; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -15,7 +15,6 @@ import java.util.List; @SpringBootTest public class WcTest { - @Test public void parse(){ service.crawlData("958022");//A组 俄罗斯 VS 沙特阿拉伯