Skip to content

L
lingxi-lxy-yanshou
Commit 1a2d29f7 authored by 技术总监-万宁's avatar 技术总监-万宁
Browse files
Options

调整项目结构

parent efa850d7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 77 deletions
.gitignore
View file @ 1a2d29f7
......@@ -3,3 +3,4 @@
/SERVICE_NAME_IS_UNDEFINED.log
/.gradle/
/.idea/
/merchant-member-service/gradle/wrapper/
multi-member-service/merchant-member-service/build.gradle → merchant-member-service/build.gradle
View file @ 1a2d29f7
......@@ -23,7 +23,7 @@ ext {
dependencies {
implementation project(':common')
implementation project(':multi-member-service:merchant-member-service:merchant-member-service-api')
implementation project(':merchant-member-service:merchant-member-service-api')
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
......
multi-member-service/merchant-member-service/settings.gradle → merchant-member-service/settings.gradle
View file @ 1a2d29f7
rootProject.name = 'merchant-member-service'
include 'common'
project(':common').projectDir = "../../common" as File
project(':common').projectDir = "../common" as File
//include 'merchant-member-service-api'
//project(':merchant-member-service-api').projectDir = "./merchant-member-service-api" as File
multi-member-service/platform-member-service/build.gradle → platform-manage-service/build.gradle
View file @ 1a2d29f7
......@@ -5,7 +5,7 @@ plugins {
id 'war'
}
group = 'com.ssy.lingxi.member'
group = 'com.ssy.lingxi'
version = '2.0.0'
sourceCompatibility = '1.8'
......@@ -13,7 +13,8 @@ repositories {
maven {
url 'http://10.0.0.21:8081/repository/maven-public/'
}
mavenCentral()
mavenLocal()
//mavenCentral()
}
ext {
......@@ -21,11 +22,9 @@ ext {
}
dependencies {
// compile group: 'io.springfox', name: 'springfox-swagger2', version: '2.7.0'
// compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.7.0'
implementation project(':common')
implementation project(':multi-member-service:platform-member-service:platform-member-service-api')
implementation project(':platform-manage-service:platform-manage-service-api')
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
......
multi-member-service/platform-member-service/gradle/wrapper/gradle-wrapper.properties → platform-manage-service/gradle/wrapper/gradle-wrapper.properties
View file @ 1a2d29f7
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
multi-member-service/platform-member-service/gradlew → platform-manage-service/gradlew
View file @ 1a2d29f7
......@@ -82,6 +82,7 @@ esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
......@@ -129,6 +130,7 @@ fi
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
......
multi-member-service/platform-member-service/gradlew.bat → platform-manage-service/gradlew.bat
View file @ 1a2d29f7
......@@ -28,7 +28,7 @@ set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
set DEFAULT_JVM_OPTS="-Dfile.encoding=UTF-8"
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
......@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
......
multi-member-service/platform-member-service/platform-member-service-api/build.gradle → platform-manage-service/platform-manage-service-api/build.gradle
View file @ 1a2d29f7
......@@ -2,7 +2,7 @@ plugins {
id 'java'
}
group 'com.ssy.lingxi.member.platform'
group 'com.ssy.lingxi'
version '2.0.0'
sourceCompatibility = 1.8
......
platform-manage-service/platform-manage-service-api/settings.gradle 0 → 100644
View file @ 1a2d29f7
rootProject.name = 'platform-manage-service-api'
\ No newline at end of file
multi-member-service/platform-member-service/platform-member-service-api/src/main/java/com/ssy/lingxi/member/platform/api/model/vo/request/BusinessTypeVO.java → platform-manage-service/platform-manage-service-api/src/main/java/com/ssy/lingxi/platform/manage/api/vo/request/BusinessTypeVO.java
View file @ 1a2d29f7
package com.ssy.lingxi.member.platform.api.model.vo.request;
package com.ssy.lingxi.platform.manage.api.vo.request;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Positive;
......
multi-member-service/platform-member-service/platform-member-service-api/src/main/java/com/ssy/lingxi/member/platform/api/model/vo/request/RoleTypeVO.java → platform-manage-service/platform-manage-service-api/src/main/java/com/ssy/lingxi/platform/manage/api/vo/request/RoleTypeVO.java
View file @ 1a2d29f7
package com.ssy.lingxi.member.platform.api.model.vo.request;
package com.ssy.lingxi.platform.manage.api.vo.request;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Positive;
......
multi-member-service/platform-member-service/platform-member-service-api/src/main/java/com/ssy/lingxi/member/platform/api/model/vo/response/ListRoleVO.java → platform-manage-service/platform-manage-service-api/src/main/java/com/ssy/lingxi/platform/manage/api/vo/response/ListRoleVO.java
View file @ 1a2d29f7
package com.ssy.lingxi.member.platform.api.model.vo.response;
package com.ssy.lingxi.platform.manage.api.vo.response;
import com.ssy.common.handler.annotation.EnableDisableStatusAnno;
import com.ssy.lingxi.member.platform.api.model.vo.request.RoleVO;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Positive;
import java.io.Serializable;
/**
......
platform-manage-service/settings.gradle 0 → 100644
View file @ 1a2d29f7
rootProject.name = 'platform-manage-service'
include 'common'
project(':common').projectDir = "../common" as File
multi-member-service/platform-member-service/src/main/java/com/ssy/lingxi/member/platform/PlatformMemberServiceApplication.java → platform-manage-service/src/main/java/com/ssy/lingxi/platform/manage/PlatformManageServiceApplication.java
View file @ 1a2d29f7
package com.ssy.lingxi.member.platform;
package com.ssy.lingxi.platform.manage;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.domain.EntityScan;
@SpringBootApplication
@EntityScan(basePackages = "com.ssy.lingxi.member.platform.entity")
public class PlatformMemberServiceApplication {
@EntityScan(basePackages = "com.ssy.lingxi.platform.manage.entity")
public class PlatformManageServiceApplication {
public static void main(String[] args) {
SpringApplication.run(PlatformMemberServiceApplication.class, args);
SpringApplication.run(PlatformManageServiceApplication.class, args);
}
}
multi-member-service/platform-member-service/src/main/java/com/ssy/lingxi/member/platform/ServletInitializer.java → platform-manage-service/src/main/java/com/ssy/lingxi/platform/manage/ServletInitializer.java
View file @ 1a2d29f7
package com.ssy.lingxi.member.platform;
package com.ssy.lingxi.platform.manage;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
......@@ -7,7 +7,7 @@ public class ServletInitializer extends SpringBootServletInitializer {
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(PlatformMemberServiceApplication.class);
return application.sources(PlatformManageServiceApplication.class);
}
}
multi-member-service/platform-member-service/src/main/java/com/ssy/lingxi/member/platform/controller/BusinessTypeController.java → platform-manage-service/src/main/java/com/ssy/lingxi/platform/manage/controller/BusinessTypeController.java
View file @ 1a2d29f7
package com.ssy.lingxi.member.platform.controller;
package com.ssy.lingxi.platform.manage.controller;
import com.ssy.common.model.vo.PageVO;
import com.ssy.common.response.Wrapper;
import com.ssy.lingxi.member.platform.api.model.vo.request.BusinessTypeVO;
import com.ssy.lingxi.member.platform.service.IBusinessTypeService;
import com.ssy.lingxi.platform.manage.api.vo.request.BusinessTypeVO;
import com.ssy.lingxi.platform.manage.service.IBusinessTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
......
multi-member-service/platform-member-service/src/main/java/com/ssy/lingxi/member/platform/controller/MemberTypeController.java → platform-manage-service/src/main/java/com/ssy/lingxi/platform/manage/controller/MemberTypeController.java
View file @ 1a2d29f7
package com.ssy.lingxi.member.platform.controller;
package com.ssy.lingxi.platform.manage.controller;
import com.ssy.common.model.vo.PageVO;
import com.ssy.common.response.Wrapper;
import com.ssy.lingxi.member.platform.api.model.vo.request.MemberTypeVO;
import com.ssy.lingxi.member.platform.service.IMemberTypeService;
import com.ssy.lingxi.platform.manage.api.vo.request.MemberTypeVO;
import com.ssy.lingxi.platform.manage.service.IMemberTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
......
multi-member-service/platform-member-service/src/main/java/com/ssy/lingxi/member/platform/controller/MenuButtonController.java → platform-manage-service/src/main/java/com/ssy/lingxi/platform/manage/controller/MenuButtonController.java
View file @ 1a2d29f7
package com.ssy.lingxi.member.platform.controller;
package com.ssy.lingxi.platform.manage.controller;
import com.ssy.common.response.Wrapper;
import com.ssy.lingxi.member.platform.model.vo.request.MenuButtonVO;
import com.ssy.lingxi.member.platform.service.IMenuButtonService;
import com.ssy.lingxi.platform.manage.model.vo.request.MenuButtonVO;
import com.ssy.lingxi.platform.manage.service.IMenuButtonService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
......
multi-member-service/platform-member-service/src/main/java/com/ssy/lingxi/member/platform/controller/MenuController.java → platform-manage-service/src/main/java/com/ssy/lingxi/platform/manage/controller/MenuController.java
View file @ 1a2d29f7
package com.ssy.lingxi.member.platform.controller;
package com.ssy.lingxi.platform.manage.controller;
import com.ssy.common.response.Wrapper;
import com.ssy.lingxi.member.platform.model.vo.request.MenuVO;
import com.ssy.lingxi.member.platform.model.vo.response.MenuTreeVO;
import com.ssy.lingxi.member.platform.service.IMenuService;
import com.ssy.lingxi.platform.manage.model.vo.request.MenuVO;
import com.ssy.lingxi.platform.manage.model.vo.response.MenuTreeVO;
import com.ssy.lingxi.platform.manage.service.IMenuService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
......
multi-member-service/platform-member-service/src/main/java/com/ssy/lingxi/member/platform/controller/OrganizationController.java → platform-manage-service/src/main/java/com/ssy/lingxi/platform/manage/controller/OrganizationController.java
View file @ 1a2d29f7
package com.ssy.lingxi.member.platform.controller;
package com.ssy.lingxi.platform.manage.controller;
import com.ssy.common.response.Wrapper;
import com.ssy.lingxi.member.platform.model.vo.request.OrganizationVO;
import com.ssy.lingxi.member.platform.model.vo.response.MenuTreeVO;
import com.ssy.lingxi.member.platform.model.vo.response.OrganizationTreeVO;
import com.ssy.lingxi.member.platform.service.IOrganizationService;
import com.ssy.lingxi.platform.manage.model.vo.request.OrganizationVO;
import com.ssy.lingxi.platform.manage.model.vo.response.MenuTreeVO;
import com.ssy.lingxi.platform.manage.model.vo.response.OrganizationTreeVO;
import com.ssy.lingxi.platform.manage.service.IOrganizationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
......
multi-member-service/platform-member-service/src/main/java/com/ssy/lingxi/member/platform/controller/RoleController.java → platform-manage-service/src/main/java/com/ssy/lingxi/platform/manage/controller/RoleController.java
View file @ 1a2d29f7
package com.ssy.lingxi.member.platform.controller;
package com.ssy.lingxi.platform.manage.controller;
import com.ssy.common.model.vo.PageVO;
import com.ssy.common.response.Wrapper;
import com.ssy.lingxi.member.platform.api.model.vo.request.RoleVO;
import com.ssy.lingxi.member.platform.service.IRoleService;
import com.ssy.lingxi.platform.manage.api.vo.request.RoleVO;
import com.ssy.lingxi.platform.manage.service.IRoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
......
multi-member-service/platform-member-service/src/main/java/com/ssy/lingxi/member/platform/controller/RoleTypeController.java → platform-manage-service/src/main/java/com/ssy/lingxi/platform/manage/controller/RoleTypeController.java
View file @ 1a2d29f7
package com.ssy.lingxi.member.platform.controller;
package com.ssy.lingxi.platform.manage.controller;
import com.ssy.common.model.vo.PageVO;
import com.ssy.common.response.Wrapper;
import com.ssy.lingxi.member.platform.api.model.vo.request.RoleTypeVO;
import com.ssy.lingxi.member.platform.service.IRoleTypeService;
import com.ssy.lingxi.platform.manage.api.vo.request.RoleTypeVO;
import com.ssy.lingxi.platform.manage.service.IRoleTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
......
multi-member-service/platform-member-service/src/main/java/com/ssy/lingxi/member/platform/entity/OrganizationDO.java → platform-manage-service/src/main/java/com/ssy/lingxi/platform/manage/entity/OrganizationDO.java
View file @ 1a2d29f7
package com.ssy.lingxi.member.platform.entity;
package com.ssy.lingxi.platform.manage.entity;
import javax.persistence.*;
import java.io.Serializable;
......@@ -10,13 +10,13 @@ import java.io.Serializable;
* @date 2020-06-17
*/
@Entity
@Table(schema = "public", name = "ms_pf_oraganization")
@Table(schema = "public", name = "man_oraganization")
public class OrganizationDO implements Serializable {
private static final long serialVersionUID = 4259213267899728060L;
@Id
@GeneratedValue(strategy= GenerationType.SEQUENCE,generator="oraganization_seq")
@SequenceGenerator(sequenceName="ms_pf_oraganization_seq", name="oraganization_seq",allocationSize = 1)
@SequenceGenerator(sequenceName="man_oraganization_seq", name="oraganization_seq",allocationSize = 1)
private Long id;
/**
......
multi-member-service/platform-member-service/src/main/java/com/ssy/lingxi/member/platform/entity/BusinessTypeDO.java → platform-manage-service/src/main/java/com/ssy/lingxi/platform/manage/entity/PlatformBusinessTypeDO.java
View file @ 1a2d29f7
package com.ssy.lingxi.member.platform.entity;
package com.ssy.lingxi.platform.manage.entity;
import com.fasterxml.jackson.annotation.JsonBackReference;
......@@ -13,13 +13,13 @@ import java.util.Set;
* @date 2020-06-03
*/
@Entity
@Table(schema = "public", name = "ms_pf_business_type")
public class BusinessTypeDO implements Serializable {
@Table(schema = "public", name = "man_platform_business_type")
public class PlatformBusinessTypeDO implements Serializable {
private static final long serialVersionUID = -294384020237469747L;
@Id
@GeneratedValue(strategy= GenerationType.SEQUENCE, generator="business_type_seq")
@SequenceGenerator(sequenceName="ms_pf_business_type_seq", name="business_type_seq",allocationSize = 1)
@GeneratedValue(strategy= GenerationType.SEQUENCE, generator="platform_business_type_seq")
@SequenceGenerator(sequenceName="man_platform_business_type_seq", name="platform_business_type_seq",allocationSize = 1)
private long id;
@Column(columnDefinition = "varchar(50)", nullable = false)
......
multi-member-service/platform-member-service/src/main/java/com/ssy/lingxi/member/platform/entity/MemberTypeDO.java → platform-manage-service/src/main/java/com/ssy/lingxi/platform/manage/entity/PlatformMemberTypeDO.java
View file @ 1a2d29f7
package com.ssy.lingxi.member.platform.entity;
package com.ssy.lingxi.platform.manage.entity;
import com.fasterxml.jackson.annotation.JsonBackReference;
......@@ -13,13 +13,13 @@ import java.util.Set;
* @date 2020-06-03
*/
@Entity
@Table(schema = "public", name = "ms_pf_member_type")
public class MemberTypeDO implements Serializable {
@Table(schema = "public", name = "man_platform_member_type")
public class PlatformMemberTypeDO implements Serializable {
private static final long serialVersionUID = 7170721092334666239L;
@Id
@GeneratedValue(strategy= GenerationType.SEQUENCE, generator="member_type_seq")
@SequenceGenerator(sequenceName="ms_pf_member_type_seq", name="member_type_seq",allocationSize = 1)
@GeneratedValue(strategy= GenerationType.SEQUENCE, generator="platform_member_type_seq")
@SequenceGenerator(sequenceName="man_platform_member_type_seq", name="platform_member_type_seq",allocationSize = 1)
private long id;
@Column(columnDefinition = "varchar(50)", nullable = false)
......
multi-member-service/platform-member-service/src/main/java/com/ssy/lingxi/member/platform/entity/MenuButtonDO.java → platform-manage-service/src/main/java/com/ssy/lingxi/platform/manage/entity/PlatformMenuButtonDO.java
View file @ 1a2d29f7
package com.ssy.lingxi.member.platform.entity;
package com.ssy.lingxi.platform.manage.entity;
import javax.persistence.*;
import java.io.Serializable;
......@@ -10,13 +10,13 @@ import java.io.Serializable;
* @date 2020-06-15
*/
@Entity
@Table(schema = "public", name = "ms_pf_menu_button", indexes = {@Index(name = "ms_pf_menu_button_key_idx", columnList = "key")})
public class MenuButtonDO implements Serializable {
@Table(schema = "public", name = "man_platform_menu_button", indexes = {@Index(name = "man_platform_menu_button_key_idx", columnList = "key")})
public class PlatformMenuButtonDO implements Serializable {
private static final long serialVersionUID = 11022110129259296L;
@Id
@GeneratedValue(strategy= GenerationType.SEQUENCE, generator="menu_button_seq")
@SequenceGenerator(sequenceName="ms_pf_menu_button_seq", name="menu_button_seq",allocationSize = 1)
@GeneratedValue(strategy= GenerationType.SEQUENCE, generator="platform_menu_button_seq")
@SequenceGenerator(sequenceName="man_platform_menu_button_seq", name="platform_menu_button_seq",allocationSize = 1)
private Long id;
/**
......
multi-member-service/platform-member-service/src/main/java/com/ssy/lingxi/member/platform/entity/MenuDO.java → platform-manage-service/src/main/java/com/ssy/lingxi/platform/manage/entity/PlatformMenuDO.java
View file @ 1a2d29f7
package com.ssy.lingxi.member.platform.entity;
package com.ssy.lingxi.platform.manage.entity;
import javax.persistence.*;
import java.io.Serializable;
......@@ -11,13 +11,13 @@ import java.util.Set;
* @date 2020-06-15
*/
@Entity
@Table(schema = "public", name = "ms_pf_menu")
public class MenuDO implements Serializable {
@Table(schema = "public", name = "man_platform_menu")
public class PlatformMenuDO implements Serializable {
private static final long serialVersionUID = 7379190136161235197L;
@Id
@GeneratedValue(strategy= GenerationType.SEQUENCE, generator="menu_seq")
@SequenceGenerator(sequenceName="ms_pf_menu_seq", name="menu_seq",allocationSize = 1)
@GeneratedValue(strategy= GenerationType.SEQUENCE, generator="platform_menu_seq")
@SequenceGenerator(sequenceName="man_platform_menu_seq", name="platform_menu_seq",allocationSize = 1)
private Long id;
/**
......@@ -67,7 +67,7 @@ public class MenuDO implements Serializable {
*/
@OneToMany(cascade = CascadeType.REMOVE, fetch = FetchType.EAGER)
@JoinColumn(name = "key", referencedColumnName="key", foreignKey = @ForeignKey(name = "none",value = ConstraintMode.NO_CONSTRAINT))
private Set<MenuButtonDO> buttons;
private Set<PlatformMenuButtonDO> buttons;
public Long getId() {
return id;
......@@ -133,11 +133,11 @@ public class MenuDO implements Serializable {
this.remark = remark;
}
public Set<MenuButtonDO> getButtons() {
public Set<PlatformMenuButtonDO> getButtons() {
return buttons;
}
public void setButtons(Set<MenuButtonDO> buttons) {
public void setButtons(Set<PlatformMenuButtonDO> buttons) {
this.buttons = buttons;
}
}
settings.gradle
View file @ 1a2d29f7
This diff is collapsed.
system-service/build.gradle
View file @ 1a2d29f7
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment