huangyujie
/
qihang-ecom-erp-open
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新项目到2.0

This commit is contained in:
启航 2024-05-06 11:40:35 +08:00
parent cc49c36dde
commit a5b6d1fe3a
25 changed files with 10990 additions and 4317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/pom.xml
View File

@ -9,7 +9,7 @@
</parent> </parent>
<artifactId>api</artifactId> <artifactId>api</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>2.0.0</version>
<name>api</name> <name>api</name>
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>

2
core/common/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.qihang</groupId> <groupId>com.qihang</groupId>
<artifactId>core</artifactId> <artifactId>core</artifactId>
<version>0.4.11</version> <version>2.0.6</version>
</parent> </parent>
<!-- <groupId>com.qihang</groupId>--> <!-- <groupId>com.qihang</groupId>-->

2
core/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.qihang</groupId> <groupId>com.qihang</groupId>
<artifactId>qihangec-oms</artifactId> <artifactId>qihangec-oms</artifactId>
<version>0.4.11</version> <version>2.0.6</version>
</parent> </parent>
<!-- <groupId>com.qihang</groupId>--> <!-- <groupId>com.qihang</groupId>-->

4
core/security/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.qihang</groupId> <groupId>com.qihang</groupId>
<artifactId>core</artifactId> <artifactId>core</artifactId>
<version>0.4.11</version> <version>2.0.6</version>
</parent> </parent>
<!-- <groupId>com.qihang</groupId>--> <!-- <groupId>com.qihang</groupId>-->
@ -72,7 +72,7 @@
<dependency> <dependency>
<groupId>com.qihang</groupId> <groupId>com.qihang</groupId>
<artifactId>common</artifactId> <artifactId>common</artifactId>
<version>1.0-SNAPSHOT</version> <version>2.0.6</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

4283
doc/sql/qihang-oms.sql
View File

File diff suppressed because one or more lines are too long

10956
docs/qihang-erp.sql Normal file
View File

File diff suppressed because it is too large Load Diff

2
doc/config/qihang-oms.yaml → docs/qihang-oms.yaml
View File

@ -24,7 +24,7 @@ spring:
max-wait: -1ms max-wait: -1ms
datasource: datasource:
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/qihang-oms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://127.0.0.1:3306/qihang-erp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root username: root
password: Andy_123 password: Andy_123

2
oms-api/pom.xml
View File

@ -55,7 +55,7 @@
<dependency> <dependency>
<groupId>com.qihang</groupId> <groupId>com.qihang</groupId>
<artifactId>security</artifactId> <artifactId>security</artifactId>
<version>1.0-SNAPSHOT</version> <version>2.0.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>

2
open-api/dou-api/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.qihang</groupId> <groupId>com.qihang</groupId>
<artifactId>open-api</artifactId> <artifactId>open-api</artifactId>
<version>1.0.0</version> <version>2.0.0</version>
</parent> </parent>
<groupId>com.qihang.dou</groupId> <groupId>com.qihang.dou</groupId>
<artifactId>dou-api</artifactId> <artifactId>dou-api</artifactId>

BIN
open-api/jd-api/libs/jd-api-1.5.4.jar Normal file
View File

Binary file not shown.

BIN
open-api/jd-api/libs/open-api-sdk-2.0-2024-03-04.jar
View File

Binary file not shown.

2
open-api/jd-api/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.qihang</groupId> <groupId>com.qihang</groupId>
<artifactId>open-api</artifactId> <artifactId>open-api</artifactId>
<version>1.0.0</version> <version>2.0.0</version>
</parent> </parent>
<groupId>com.qihang.jd</groupId> <groupId>com.qihang.jd</groupId>
<artifactId>jd-api</artifactId> <artifactId>jd-api</artifactId>

2
open-api/kwai-api/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.qihang</groupId> <groupId>com.qihang</groupId>
<artifactId>open-api</artifactId> <artifactId>open-api</artifactId>
<version>1.0.0</version> <version>2.0.0</version>
</parent> </parent>
<groupId>com.qihang.kwai</groupId> <groupId>com.qihang.kwai</groupId>

2
open-api/pdd-api/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.qihang</groupId> <groupId>com.qihang</groupId>
<artifactId>open-api</artifactId> <artifactId>open-api</artifactId>
<version>1.0.0</version> <version>2.0.0</version>
</parent> </parent>
<groupId>com.qihang.pdd</groupId> <groupId>com.qihang.pdd</groupId>
<artifactId>pdd-api</artifactId> <artifactId>pdd-api</artifactId>

4
open-api/pom.xml
View File

@ -12,7 +12,7 @@
<groupId>com.qihang</groupId> <groupId>com.qihang</groupId>
<artifactId>open-api</artifactId> <artifactId>open-api</artifactId>
<version>1.0.0</version> <version>2.0.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>tao-api</module> <module>tao-api</module>
@ -65,7 +65,7 @@
<dependency> <dependency>
<groupId>com.qihang</groupId> <groupId>com.qihang</groupId>
<artifactId>security</artifactId> <artifactId>security</artifactId>
<version>1.0-SNAPSHOT</version> <version>2.0.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>

BIN
open-api/tao-api/libs/tao-1.4.12.jar
View File

Binary file not shown.

BIN
open-api/tao-api/libs/tao-api2-1.5.4.jar Normal file
View File

Binary file not shown.

BIN
open-api/tao-api/libs/taobao-sdk-0.20200820.jar
View File

Binary file not shown.

BIN
open-api/tao-api/libs/taobao-sdk-0.20240301-source.jar
View File

Binary file not shown.

BIN
open-api/tao-api/libs/taobao-sdk-0.20240301.jar
View File

Binary file not shown.

2
open-api/tao-api/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.qihang</groupId> <groupId>com.qihang</groupId>
<artifactId>open-api</artifactId> <artifactId>open-api</artifactId>
<version>1.0.0</version> <version>2.0.0</version>
</parent> </parent>
<artifactId>tao-api</artifactId> <artifactId>tao-api</artifactId>

10
open-api/wei-api/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.qihang</groupId> <groupId>com.qihang</groupId>
<artifactId>open-api</artifactId> <artifactId>open-api</artifactId>
<version>1.0.0</version> <version>2.0.0</version>
</parent> </parent>
<groupId>com.qihang.wei</groupId> <groupId>com.qihang.wei</groupId>
@ -42,10 +42,10 @@
<!-- <groupId>org.springframework.boot</groupId>--> <!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-undertow</artifactId>--> <!-- <artifactId>spring-boot-starter-undertow</artifactId>-->
<!-- </dependency>--> <!-- </dependency>-->
<!-- <dependency>--> <dependency>
<!-- <groupId>org.springframework.boot</groupId>--> <groupId>org.springframework.boot</groupId>
<!-- <artifactId>spring-boot-starter-webflux</artifactId>--> <artifactId>spring-boot-starter-webflux</artifactId>
<!-- </dependency>--> </dependency>
<!-- <dependency>--> <!-- <dependency>-->
<!-- <groupId>com.alibaba.cloud</groupId>--> <!-- <groupId>com.alibaba.cloud</groupId>-->
<!-- <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>--> <!-- <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->

2
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>com.qihang</groupId> <groupId>com.qihang</groupId>
<artifactId>qihangec-oms</artifactId> <artifactId>qihangec-oms</artifactId>
<version>0.4.11</version> <version>2.0.6</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>qihangec-oms</name> <name>qihangec-oms</name>

2
sys-api/pom.xml
View File

@ -174,7 +174,7 @@
<dependency> <dependency>
<groupId>com.qihang</groupId> <groupId>com.qihang</groupId>
<artifactId>security</artifactId> <artifactId>security</artifactId>
<version>1.0-SNAPSHOT</version> <version>2.0.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>

26
sys-api/src/main/resources/mapper/system/SysMenuMapper.xml
View File

@ -29,7 +29,7 @@
<sql id="selectMenuVo"> <sql id="selectMenuVo">
select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
from sys_menu from sys_menu_oms
</sql> </sql>
<select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult"> <select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
@ -50,13 +50,13 @@
<select id="selectMenuTreeAll" resultMap="SysMenuResult"> <select id="selectMenuTreeAll" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0 from sys_menu_oms m where m.menu_type in ('M', 'C') and m.status = 0
order by m.parent_id, m.order_num order by m.parent_id, m.order_num
</select> </select>
<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult"> <select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m from sys_menu_oms m
left join sys_role_menu rm on m.menu_id = rm.menu_id left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id left join sys_user_role ur on rm.role_id = ur.role_id
left join sys_role ro on ur.role_id = ro.role_id left join sys_role ro on ur.role_id = ro.role_id
@ -75,7 +75,7 @@
<select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult"> <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m from sys_menu_oms m
left join sys_role_menu rm on m.menu_id = rm.menu_id left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id left join sys_user_role ur on rm.role_id = ur.role_id
left join sys_role ro on ur.role_id = ro.role_id left join sys_role ro on ur.role_id = ro.role_id
@ -86,25 +86,25 @@
<select id="selectMenuListByRoleId" resultType="Long"> <select id="selectMenuListByRoleId" resultType="Long">
select m.menu_id select m.menu_id
from sys_menu m from sys_menu_oms m
left join sys_role_menu rm on m.menu_id = rm.menu_id left join sys_role_menu rm on m.menu_id = rm.menu_id
where rm.role_id = #{roleId} where rm.role_id = #{roleId}
<if test="menuCheckStrictly"> <if test="menuCheckStrictly">
and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId}) and m.menu_id not in (select m.parent_id from sys_menu_oms m inner join sys_role_menu rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId})
</if> </if>
order by m.parent_id, m.order_num order by m.parent_id, m.order_num
</select> </select>
<select id="selectMenuPerms" resultType="String"> <select id="selectMenuPerms" resultType="String">
select distinct m.perms select distinct m.perms
from sys_menu m from sys_menu_oms m
left join sys_role_menu rm on m.menu_id = rm.menu_id left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id left join sys_user_role ur on rm.role_id = ur.role_id
</select> </select>
<select id="selectMenuPermsByUserId" parameterType="Long" resultType="String"> <select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
select distinct m.perms select distinct m.perms
from sys_menu m from sys_menu_oms m
left join sys_role_menu rm on m.menu_id = rm.menu_id left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id left join sys_user_role ur on rm.role_id = ur.role_id
left join sys_role r on r.role_id = ur.role_id left join sys_role r on r.role_id = ur.role_id
@ -113,7 +113,7 @@
<select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String"> <select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
select distinct m.perms select distinct m.perms
from sys_menu m from sys_menu_oms m
left join sys_role_menu rm on m.menu_id = rm.menu_id left join sys_role_menu rm on m.menu_id = rm.menu_id
where m.status = '0' and rm.role_id = #{roleId} where m.status = '0' and rm.role_id = #{roleId}
</select> </select>
@ -124,7 +124,7 @@
</select> </select>
<select id="hasChildByMenuId" resultType="Integer"> <select id="hasChildByMenuId" resultType="Integer">
select count(1) from sys_menu where parent_id = #{menuId} select count(1) from sys_menu_oms where parent_id = #{menuId}
</select> </select>
<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult"> <select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
@ -133,7 +133,7 @@
</select> </select>
<update id="updateMenu" parameterType="SysMenu"> <update id="updateMenu" parameterType="SysMenu">
update sys_menu update sys_menu_oms
<set> <set>
<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if> <if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
<if test="parentId != null">parent_id = #{parentId},</if> <if test="parentId != null">parent_id = #{parentId},</if>
@ -156,7 +156,7 @@
</update> </update>
<insert id="insertMenu" parameterType="SysMenu"> <insert id="insertMenu" parameterType="SysMenu">
insert into sys_menu( insert into sys_menu_oms(
<if test="menuId != null and menuId != 0">menu_id,</if> <if test="menuId != null and menuId != 0">menu_id,</if>
<if test="parentId != null and parentId != 0">parent_id,</if> <if test="parentId != null and parentId != 0">parent_id,</if>
<if test="menuName != null and menuName != ''">menu_name,</if> <if test="menuName != null and menuName != ''">menu_name,</if>
@ -196,7 +196,7 @@
</insert> </insert>
<delete id="deleteMenuById" parameterType="Long"> <delete id="deleteMenuById" parameterType="Long">
delete from sys_menu where menu_id = #{menuId} delete from sys_menu_oms where menu_id = #{menuId}
</delete> </delete>
</mapper> </mapper>