Skip to content

R
rs-cloud-platform
Commit bcec2f8f authored by 周健威's avatar 周健威
Browse files
Options

修改

parent 966a4324
Hide whitespace changes
Inline Side-by-side
Showing with 462 additions and 45 deletions
ace-modules/ace-generator/pom.xml
View file @ bcec2f8f
...@@ -56,6 +56,11 @@ ...@@ -56,6 +56,11 @@
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version> <version>${mysql.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>9.4.1212</version>
</dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
......
ace-modules/ace-generator/src/main/java/com/github/wxiaoqi/security/generator/mapper/GeneratorMapper.java
View file @ bcec2f8f
...@@ -15,8 +15,17 @@ public interface GeneratorMapper { ...@@ -15,8 +15,17 @@ public interface GeneratorMapper {
List<Map<String, Object>> queryList(Map<String, Object> map); List<Map<String, Object>> queryList(Map<String, Object> map);
int queryTotal(Map<String, Object> map); int queryTotal(Map<String, Object> map);
Map<String, String> queryTable(String tableName); Map<String, String> queryTable(String tableName);
List<Map<String, String>> queryColumns(String tableName); List<Map<String, String>> queryColumns(String tableName);
List<Map<String, Object>> psqlQueryList(Map<String, Object> map);
int psqlQueryTotal(Map<String, Object> map);
Map<String, String> psqlQueryTable(String tableName);
List<Map<String, String>> psqlQueryColumns(String tableName);
} }
ace-modules/ace-generator/src/main/java/com/github/wxiaoqi/security/generator/service/GeneratorService.java
View file @ bcec2f8f
package com.github.wxiaoqi.security.generator.service; package com.github.wxiaoqi.security.generator.service;
import com.alibaba.druid.pool.DruidDataSource;
import com.github.wxiaoqi.security.generator.mapper.GeneratorMapper; import com.github.wxiaoqi.security.generator.mapper.GeneratorMapper;
import com.github.wxiaoqi.security.generator.utils.GeneratorUtils; import com.github.wxiaoqi.security.generator.utils.GeneratorUtils;
import org.apache.tomcat.util.http.fileupload.IOUtils; import org.apache.tomcat.util.http.fileupload.IOUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.sql.DataSource;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -23,23 +25,38 @@ public class GeneratorService { ...@@ -23,23 +25,38 @@ public class GeneratorService {
@Autowired @Autowired
private GeneratorMapper generatorMapper; private GeneratorMapper generatorMapper;
@Autowired
DruidDataSource dataSource;
public List<Map<String, Object>> queryList(Map<String, Object> map) { public List<Map<String, Object>> queryList(Map<String, Object> map) {
int offset = Integer.parseInt(map.get("offset").toString()); int offset = Integer.parseInt(map.get("offset").toString());
int limit = Integer.parseInt(map.get("limit").toString()); int limit = Integer.parseInt(map.get("limit").toString());
map.put("offset", offset); map.put("offset", offset);
map.put("limit", limit); map.put("limit", limit);
if(dataSource.getDriverClassName().contains("postgresql")) {
return generatorMapper.psqlQueryList(map);
}
return generatorMapper.queryList(map); return generatorMapper.queryList(map);
} }
public int queryTotal(Map<String, Object> map) { public int queryTotal(Map<String, Object> map) {
if(dataSource.getDriverClassName().contains("postgresql")) {
return generatorMapper.psqlQueryTotal(map);
}
return generatorMapper.queryTotal(map); return generatorMapper.queryTotal(map);
} }
public Map<String, String> queryTable(String tableName) { public Map<String, String> queryTable(String tableName) {
if(dataSource.getDriverClassName().contains("postgresql")) {
return generatorMapper.psqlQueryTable(tableName);
}
return generatorMapper.queryTable(tableName); return generatorMapper.queryTable(tableName);
} }
public List<Map<String, String>> queryColumns(String tableName) { public List<Map<String, String>> queryColumns(String tableName) {
if(dataSource.getDriverClassName().contains("postgresql")) {
return generatorMapper.psqlQueryColumns(tableName);
}
return generatorMapper.queryColumns(tableName); return generatorMapper.queryColumns(tableName);
} }
......
ace-modules/ace-generator/src/main/resources/application.yml
View file @ bcec2f8f
...@@ -5,14 +5,23 @@ server: ...@@ -5,14 +5,23 @@ server:
min-spare-threads: 10 min-spare-threads: 10
port: 7777 port: 7777
logging:
level:
com.github.wxiaoqi.security.generator.mapper: DEBUG
com.xxfc.platform.order: DEBUG
# mysql # mysql
spring: spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.jdbc.Driver driverClassName: com.mysql.jdbc.Driver
url: jdbc:mysql://10.5.52.3:3306/xxfc_order?useUnicode=true&characterEncoding=UTF-8 url: jdbc:mysql://10.5.52.4:3307/rscp_website?useUnicode=true&characterEncoding=UTF-8
username: root username: root
password: sslcloud123*() password: sslcloud123*()
# driverClassName: org.postgresql.Driver
# url: jdbc:postgresql://10.5.52.6:5432/rscloudmart
# username: postgres
# password: root
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss date-format: yyyy-MM-dd HH:mm:ss
......
ace-modules/ace-generator/src/main/resources/mapper/GeneratorMapper.xml
View file @ bcec2f8f
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
<select id="queryTotal" resultType="int"> <select id="queryTotal" resultType="int">
select count(*) from information_schema.tables where table_schema = (select database()) select count(*) from information_schema.tables where table_schema = (select database())
<if test="tableName != null and tableName.trim() != ''"> <if test="tableName != null and tableName.trim() != ''">
and table_name like concat('%', #{tableName}, '%') and table_name like concat('%', #{tableName}, '%')
</if> </if>
</select> </select>
<select id="queryTable" resultType="map"> <select id="queryTable" resultType="map">
select table_name tableName, engine, table_comment tableComment, create_time createTime from information_schema.tables select table_name tableName, engine, table_comment tableComment, create_time createTime from information_schema.tables
where table_schema = (select database()) and table_name = #{tableName} where table_schema = (select database()) and table_name = #{tableName}
</select> </select>
...@@ -30,4 +30,43 @@ ...@@ -30,4 +30,43 @@
select column_name columnName, data_type dataType, column_comment columnComment, column_key columnKey, extra from information_schema.columns select column_name columnName, data_type dataType, column_comment columnComment, column_key columnKey, extra from information_schema.columns
where table_name = #{tableName} and table_schema = (select database()) order by ordinal_position where table_name = #{tableName} and table_schema = (select database()) order by ordinal_position
</select> </select>
<select id="psqlQueryList" resultType="map">
select c.relname "tableName", 'InnoDB' as engine, cast(obj_description(c.relfilenode,'pg_class') as varchar) as "tableComment", '2020-01-01 00:00:00' as "createTime"
from pg_class c
where c.relname in (select tablename from pg_tables where schemaname='public' and position('_2' in tablename)=0)
<if test="tableName != null and tableName.trim() != ''">
and c.relname like '%'||#{tableName}||'%'
</if>
order by c.relfilenode desc
<if test="offset != null and limit != null">
limit #{limit} offset #{offset}
</if>
</select>
<select id="psqlQueryTotal" resultType="int">
select count(*)
from pg_class c
where c.relname in (select tablename from pg_tables where schemaname='public' and position('_2' in tablename)=0)
<if test="tableName != null and tableName.trim() != ''">
and c.relname like '%'||#{tableName}||'%'
</if>
</select>
<select id="psqlQueryTable" resultType="map">
select c.relname "tableName", 'InnoDB' as engine, cast(obj_description(c.relfilenode,'pg_class') as varchar) as "tableComment", '2020-01-01 00:00:00' as "createTime"
from pg_class c
where c.relname in (select tablename from pg_tables where schemaname='public' and position('_2' in tablename)=0)
and c.relname = #{tableName}
</select>
<select id="psqlQueryColumns" resultType="map">
select a.attname as "columnName",d.description "columnComment",concat_ws('',t.typname,SUBSTRING(format_type(a.atttypid,a.atttypmod) from '\(.*\)')) as "dataType"
from pg_class c,pg_attribute a,pg_type t,pg_description d
where a.attnum>0 and a.attrelid=c.oid and a.atttypid=t.oid and d.objoid=a.attrelid and d.objsubid=a.attnum
and c.relname in (select c from pg_tables where schemaname='public' and position('_2' in tablename)=0) order by relfilenode desc, c.relname,a.attnum
select column_name columnName, data_type dataType, column_comment columnComment, column_key columnKey, extra from information_schema.columns
where table_name = #{tableName} and table_schema = (select database()) order by ordinal_position
</select>
</mapper> </mapper>
\ No newline at end of file
ace-modules/ace-generator/target/classes/application.yml
View file @ bcec2f8f
...@@ -5,14 +5,23 @@ server: ...@@ -5,14 +5,23 @@ server:
min-spare-threads: 10 min-spare-threads: 10
port: 7777 port: 7777
logging:
level:
com.github.wxiaoqi.security.generator.mapper: DEBUG
com.xxfc.platform.order: DEBUG
# mysql # mysql
spring: spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.jdbc.Driver #driverClassName: com.mysql.jdbc.Driver
url: jdbc:mysql://10.5.52.3:3306/xxfc_order?useUnicode=true&characterEncoding=UTF-8 #url: jdbc:mysql://10.5.52.3:3306/xxfc_order?useUnicode=true&characterEncoding=UTF-8
username: root #username: root
password: sslcloud123*() #password: sslcloud123*()
driverClassName: org.postgresql.Driver
url: jdbc:postgresql://10.5.52.6:5432/rscloudmart
username: postgres
password: root
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss date-format: yyyy-MM-dd HH:mm:ss
......
ace-modules/ace-generator/target/classes/mapper/GeneratorMapper.xml
View file @ bcec2f8f
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
<select id="queryTotal" resultType="int"> <select id="queryTotal" resultType="int">
select count(*) from information_schema.tables where table_schema = (select database()) select count(*) from information_schema.tables where table_schema = (select database())
<if test="tableName != null and tableName.trim() != ''"> <if test="tableName != null and tableName.trim() != ''">
and table_name like concat('%', #{tableName}, '%') and table_name like concat('%', #{tableName}, '%')
</if> </if>
</select> </select>
<select id="queryTable" resultType="map"> <select id="queryTable" resultType="map">
select table_name tableName, engine, table_comment tableComment, create_time createTime from information_schema.tables select table_name tableName, engine, table_comment tableComment, create_time createTime from information_schema.tables
where table_schema = (select database()) and table_name = #{tableName} where table_schema = (select database()) and table_name = #{tableName}
</select> </select>
...@@ -30,4 +30,36 @@ ...@@ -30,4 +30,36 @@
select column_name columnName, data_type dataType, column_comment columnComment, column_key columnKey, extra from information_schema.columns select column_name columnName, data_type dataType, column_comment columnComment, column_key columnKey, extra from information_schema.columns
where table_name = #{tableName} and table_schema = (select database()) order by ordinal_position where table_name = #{tableName} and table_schema = (select database()) order by ordinal_position
</select> </select>
<select id="psqlQueryList" resultType="map">
select c.relname "tableName", 'InnoDB' as engine, cast(obj_description(c.relfilenode,'pg_class') as varchar) as "tableComment", '2020-01-01 00:00:00' as "createTime"
from pg_class c
where c.relname in (select tablename from pg_tables where schemaname='public' and position('_2' in tablename)=0)
<if test="tableName != null and tableName.trim() != ''">
and c.relname like '%'||#{tableName}||'%'
</if>
order by c.relfilenode desc
<if test="offset != null and limit != null">
limit #{limit} offset #{offset}
</if>
</select>
<select id="psqlQueryTotal" resultType="int">
select count(*)
from pg_class c
where c.relname in (select tablename from pg_tables where schemaname='public' and position('_2' in tablename)=0)
<if test="tableName != null and tableName.trim() != ''">
and c.relname like '%'||#{tableName}||'%'
</if>
</select>
<select id="psqlQueryTable" resultType="map">
select table_name tableName, engine, table_comment tableComment, create_time createTime from information_schema.tables
where table_schema = (select database()) and table_name = #{tableName}
</select>
<select id="psqlQueryColumns" resultType="map">
select column_name columnName, data_type dataType, column_comment columnComment, column_key columnKey, extra from information_schema.columns
where table_name = #{tableName} and table_schema = (select database()) order by ordinal_position
</select>
</mapper> </mapper>
\ No newline at end of file
pom.xml
View file @ bcec2f8f
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
<module>ace-modules</module> <module>ace-modules</module>
<module>rs-common</module> <module>rs-common</module>
<module>rs-universal</module> <module>rs-universal</module>
<module>rs-datacenter</module>
<module>rs-website</module>
</modules> </modules>
<packaging>pom</packaging> <packaging>pom</packaging>
<developers> <developers>
......
rs-datacenter/pom.xml 0 → 100644
View file @ bcec2f8f
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>ace-security</artifactId>
<groupId>com.github.wxiaoqi</groupId>
<version>2.0-rscp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rs-datacenter</artifactId>
<packaging>pom</packaging>
<version>2.0-rscp-SNAPSHOT</version>
<modules>
<module>rs-datacenter-api</module>
<module>rs-datacenter-server</module>
</modules>
</project>
\ No newline at end of file
rs-datacenter/rs-datacenter-api/pom.xml 0 → 100644
View file @ bcec2f8f
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.upyuns.common</groupId>
<artifactId>rs-common-platform</artifactId>
<version>2.0-rscp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rs-datacenter-api</artifactId>
</project>
\ No newline at end of file
rs-datacenter/rs-datacenter-server/pom.xml 0 → 100644
View file @ bcec2f8f
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>rs-datacenter</artifactId>
<groupId>com.github.wxiaoqi</groupId>
<version>2.0-rscp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rs-datacenter-server</artifactId>
</project>
\ No newline at end of file
rs-universal/rs-universal-server/pom.xml
View file @ bcec2f8f
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<groupId>com.upyuns.platform.rs</groupId> <groupId>com.upyuns.platform.rs</groupId>
<artifactId>rs-universal-api</artifactId> <artifactId>rs-universal-api</artifactId>
<version>2.0-rscp-SNAPSHOT</version> <version>2.0-rscp-SNAPSHOT</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
......
rs-universal/rs-universal-server/src/main/resources/bootstrap.yml
View file @ bcec2f8f
...@@ -27,11 +27,4 @@ spring: ...@@ -27,11 +27,4 @@ spring:
server-addr: 127.0.0.1:8848 server-addr: 127.0.0.1:8848
#共用配置，暂定一个 #共用配置，暂定一个
shared-dataids: common-dev.yaml,mongodb-log-dev.yaml shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
namespace: rs-cloud-platform namespace: rs-cloud-platform
--- \ No newline at end of file
spring:
profiles: pro
cloud:
nacos:
config:
server-addr: 10.5.52.2:8848
\ No newline at end of file
rs-universal/rs-universal-server/src/main/resources/mapper/DictionaryMapper.xml
View file @ bcec2f8f
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.upyuns.platform.rs.universal.mapper.DictionaryMapper" > <mapper namespace="com.upyuns.platform.rs.universal.mapper.DictionaryMapper" >
<resultMap id="BaseResultMap" type="Dictionary" > <resultMap id="BaseResultMap" type="com.upyuns.platform.rs.universal.entity.Dictionary" >
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
--> -->
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<result column="detail" property="detail" jdbcType="VARCHAR" /> <result column="detail" property="detail" jdbcType="VARCHAR" />
</resultMap> </resultMap>
<select id="selectByCodeAndType" parameterType="Dictionary" resultType="Dictionary"> <select id="selectByCodeAndType" parameterType="com.upyuns.platform.rs.universal.entity.Dictionary" resultType="com.upyuns.platform.rs.universal.entity.Dictionary">
select * from data_dictionary select * from data_dictionary
<where> <where>
<if test="type != null"> <if test="type != null">
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</where> </where>
</select> </select>
<select id = "selectByPid" parameterType="java.lang.Integer" resultType="Dictionary"> <select id = "selectByPid" parameterType="java.lang.Integer" resultType="com.upyuns.platform.rs.universal.entity.Dictionary">
select * from data_dictionary select * from data_dictionary
where pid = #{pid} where pid = #{pid}
</select> </select>
......
rs-universal/rs-universal-server/src/main/resources/mapper/IdInformationMapper.xml
View file @ bcec2f8f
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.upyuns.platform.rs.universal.mapper.IdInformationMapper"> <mapper namespace="com.upyuns.platform.rs.universal.mapper.IdInformationMapper">
<resultMap type="IdInformation" id="IdInformation"> <resultMap type="com.upyuns.platform.rs.universal.entity.IdInformation" id="IdInformation">
<result property="id" column="id"/> <result property="id" column="id"/>
<result property="idNumber" column="id_number"/> <result property="idNumber" column="id_number"/>
<result property="name" column="name"/> <result property="name" column="name"/>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<result property="expirationDate" column="expiration_date"/> <result property="expirationDate" column="expiration_date"/>
<result property="authenticationMethods" column="authentication_methods"/> <result property="authenticationMethods" column="authentication_methods"/>
</resultMap> </resultMap>
<select id="selectByUserId" resultType="IdInformation" parameterType="java.lang.Integer"> <select id="selectByUserId" resultType="com.upyuns.platform.rs.universal.entity.IdInformation" parameterType="java.lang.Integer">
select * from id_information where user_login_id = #{userLoginId} select * from id_information where user_login_id = #{userLoginId}
</select> </select>
......
rs-universal/rs-universal-server/src/main/resources/mapper/MemberFamilyInfoMapper.xml
View file @ bcec2f8f
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.upyuns.platform.rs.universal.mapper.MemberFamilyInfoMapper"> <mapper namespace="com.upyuns.platform.rs.universal.mapper.MemberFamilyInfoMapper">
<resultMap id="BaseResultMap" type="MemberFamilyInfo"> <resultMap id="BaseResultMap" type="com.upyuns.platform.rs.universal.entity.MemberFamilyInfo">
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
--> -->
......
rs-universal/rs-universal-server/src/main/resources/mapper/MemberInfoMapper.xml
View file @ bcec2f8f
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.upyuns.platform.rs.universal.mapper.MemberInfoMapper"> <mapper namespace="com.upyuns.platform.rs.universal.mapper.MemberInfoMapper">
<resultMap id="BaseResultMap" type="MemberInfo"> <resultMap id="BaseResultMap" type="com.upyuns.platform.rs.universal.entity.MemberInfo">
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
--> -->
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
create_user_name, state create_user_name, state
</sql> </sql>
<resultMap id="MemberInfoVoResultMap" type="MemberInfoVo"> <resultMap id="MemberInfoVoResultMap" type="com.upyuns.platform.rs.universal.vo.MemberInfoVo">
<id column="id" jdbcType="INTEGER" property="id" /> <id column="id" jdbcType="INTEGER" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" /> <result column="name" jdbcType="VARCHAR" property="name" />
<result column="sex" jdbcType="BIT" property="sex" /> <result column="sex" jdbcType="BIT" property="sex" />
......
rs-universal/rs-universal-server/src/main/resources/mapper/OrderPayMapper.xml
View file @ bcec2f8f
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<mapper namespace="com.upyuns.platform.rs.universal.mapper.OrderPayMapper"> <mapper namespace="com.upyuns.platform.rs.universal.mapper.OrderPayMapper">
<!-- 可根据自己的需求，是否要使用 --> <!-- 可根据自己的需求，是否要使用 -->
<resultMap type="OrderPay" id="orderPayMap"> <resultMap type="com.upyuns.platform.rs.universal.entity.OrderPay" id="orderPayMap">
<result property="id" column="id"/> <result property="id" column="id"/>
<result property="tradeNo" column="trade_no"/> <result property="tradeNo" column="trade_no"/>
<result property="orderNo" column="order_no"/> <result property="orderNo" column="order_no"/>
......
rs-universal/rs-universal-server/src/main/resources/mapper/OrderRefundMapper.xml
View file @ bcec2f8f
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<mapper namespace="com.upyuns.platform.rs.universal.mapper.OrderRefundMapper"> <mapper namespace="com.upyuns.platform.rs.universal.mapper.OrderRefundMapper">
<!-- 可根据自己的需求，是否要使用 --> <!-- 可根据自己的需求，是否要使用 -->
<resultMap type="OrderRefund" id="orderRefundMap"> <resultMap type="com.upyuns.platform.rs.universal.entity.OrderRefund" id="orderRefundMap">
<result property="id" column="id"/> <result property="id" column="id"/>
<result property="refundTradeNo" column="refund_trade_no"/> <result property="refundTradeNo" column="refund_trade_no"/>
<result property="orderNo" column="order_no"/> <result property="orderNo" column="order_no"/>
......
rs-universal/rs-universal-server/src/main/resources/mapper/SysRegionMapper.xml
View file @ bcec2f8f
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<mapper namespace="com.upyuns.platform.rs.universal.mapper.SysRegionMapper"> <mapper namespace="com.upyuns.platform.rs.universal.mapper.SysRegionMapper">
<select id="getAllByPage" parameterType="java.util.Map" <select id="getAllByPage" parameterType="java.util.Map"
resultType="SysRegion"> resultType="com.upyuns.platform.rs.universal.entity.SysRegion">
select `id`, parent_id, `name`, `type`, agency_id from sys_region limit #{pageStart},${pageSize} select `id`, parent_id, `name`, `type`, agency_id from sys_region limit #{pageStart},${pageSize}
</select> </select>
<select id="getByIdList" parameterType="java.util.List" <select id="getByIdList" parameterType="java.util.List"
resultType="SysRegion"> resultType="com.upyuns.platform.rs.universal.entity.SysRegion">
select `id`, parent_id, `name`, `type`, agency_id from sys_region where id in select `id`, parent_id, `name`, `type`, agency_id from sys_region where id in
<foreach collection="list" index="i" item="item" open="(" close=")" separator=","> <foreach collection="list" index="i" item="item" open="(" close=")" separator=",">
#{item} #{item}
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
select `id` from sys_region where name like CONCAT('%',#{name},'%') and type=#{type} limit 1 select `id` from sys_region where name like CONCAT('%',#{name},'%') and type=#{type} limit 1
</select> </select>
<select id="findByCityName" resultType="RegionDTO"> <select id="findByCityName" resultType="com.upyuns.platform.rs.universal.dto.RegionDTO">
select `id`,`parent_id` as `parentId` from `sys_region` where `type`=2 and `name` like concat('%',#{city} ,'%') select `id`,`parent_id` as `parentId` from `sys_region` where `type`=2 and `name` like concat('%',#{city} ,'%')
</select> </select>
</mapper> </mapper>
\ No newline at end of file
rs-universal/rs-universal-server/target/classes/bootstrap.yml
View file @ bcec2f8f
...@@ -27,11 +27,4 @@ spring: ...@@ -27,11 +27,4 @@ spring:
server-addr: 127.0.0.1:8848 server-addr: 127.0.0.1:8848
#共用配置，暂定一个 #共用配置，暂定一个
shared-dataids: common-dev.yaml,mongodb-log-dev.yaml shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
namespace: rs-cloud-platform namespace: rs-cloud-platform
--- \ No newline at end of file
spring:
profiles: pro
cloud:
nacos:
config:
server-addr: 10.5.52.2:8848
\ No newline at end of file
rs-website/pom.xml 0 → 100644
View file @ bcec2f8f
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>ace-security</artifactId>
<groupId>com.github.wxiaoqi</groupId>
<version>2.0-rscp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rs-website</artifactId>
<packaging>pom</packaging>
<modules>
<module>rs-website-api</module>
<module>rs-website-server</module>
</modules>
</project>
\ No newline at end of file
rs-website/rs-website-api/pom.xml 0 → 100644
View file @ bcec2f8f
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.upyuns.common</groupId>
<artifactId>rs-common-platform</artifactId>
<version>2.0-rscp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.upyuns.platform.rs</groupId>
<artifactId>rs-website-api</artifactId>
<version>2.0-rscp-SNAPSHOT</version>
</project>
\ No newline at end of file
rs-website/rs-website-server/pom.xml 0 → 100644
View file @ bcec2f8f
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>rs-common-platform-web</artifactId>
<groupId>com.upyuns.common</groupId>
<version>2.0-rscp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rs-website-server</artifactId>
<dependencies>
<dependency>
<groupId>com.upyuns.platform.rs</groupId>
<artifactId>rs-universal-api</artifactId>
<version>2.0-rscp-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.upyuns.platform.rs</groupId>
<artifactId>rs-website-api</artifactId>
<version>2.0-rscp-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/WebsiteApplication.java 0 → 100644
View file @ bcec2f8f
package com.upyuns.platform.rs.website;
import com.ace.cache.EnableAceCache;
import com.github.wxiaoqi.security.api.vo.config.HeaderConfig;
import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
import com.github.wxiaoqi.security.common.annotation.AddBasicConfiguration;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@SpringBootApplication(scanBasePackages = {
"com.upyuns.platform.rs",
"com.github.wxiaoqi.security.common.handler"
})
@EnableDiscoveryClient
@EnableAceAuthClient
@EnableScheduling
@EnableAceCache
@EnableTransactionManagement
@AddBasicConfiguration
@tk.mybatis.spring.annotation.MapperScan(basePackages = "com.upyuns.platform.rs.website.mapper")
@EnableFeignClients(value = {"com.upyuns.platform.rs","com.github.wxiaoqi.security"},defaultConfiguration = HeaderConfig.class)
public class WebsiteApplication {
public static void main(String[] args) {
SpringApplication.run(WebsiteApplication.class, args);
}
}
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/mapper/DemoMapper.java 0 → 100644
View file @ bcec2f8f
package com.upyuns.platform.rs.website.mapper;
import com.upyuns.platform.rs.website.entity.Demo;
import tk.mybatis.mapper.common.Mapper;
public interface DemoMapper extends Mapper<Demo> {
}
\ No newline at end of file
rs-website/rs-website-server/src/main/resources/application.properties 0 → 100644
View file @ bcec2f8f
#\u8BA4\u8BC1\u63A5\u53E3\u9700\u8981\u643A\u5E26\u7684\u53C2\u6570
#A-\u8BA4\u8BC1
certif.cHost=https://idcert.market.alicloudapi.com
certif.cPath=/idcard
certif.cMethod=GET
certif.cAppcode=acea1c8811f748b3a65815f11db357c4
#1.\u8BF7\u6C42
#\u8EAB\u4EFD\u8BC1\u53F7\u5B57\u6BB5\u540D\u79F0
certif.idCardName=idCard
#\u59D3\u540D\u5B57\u6BB5\u540D\u79F0
certif.cName=name
#2.\u54CD\u5E94
#\u9519\u8BEF\u7801\u5B57\u6BB5\u540D
certif.certifRet=status
#\u8BA4\u8BC1\u6210\u529F\u7801
certif.certifResultCode=01
#B-\u56FE\u7247\u89E3\u6790
certif.iHost=https://ocridcard.market.alicloudapi.com
certif.iPath=/idimages
certif.iMethod=POST
certif.iAppcode=acea1c8811f748b3a65815f11db357c4
#1.\u8BF7\u6C42
#\u56FE\u7247url\u5B57\u6BB5\u540D
certif.picName=image
#\u65B9\u5411\u5B57\u6BB5\u540D
certif.typeName=idCardSide
#\u56FE\u7247\u6B63\u9762\u6807\u8BC6\u53C2\u6570
certif.frontParameter=front
#\u56FE\u7247\u80CC\u9762\u6807\u8BC6\u53C2\u6570
certif.backParameter=back
#2.\u54CD\u5E94
#\u56FE\u7247\u89E3\u6790\u54CD\u5E94\u643A\u5E26\u9519\u8BEF\u7801\u5B57\u6BB5\u540D
certif.imageRet=code
#\u56FE\u7247\u89E3\u6790\u6210\u529F\u7801
certif.imageResultCode=1
#\u5185\u5BB9\u5B57\u6BB5\u540D
certif.dataNam=result
#\u8EAB\u4EFD\u8BC1\u53F7\u5B57\u6BB5\u540D
certif.numberName=code
#\u7528\u6237\u59D3\u540D\u5B57\u6BB5\u540D
certif.iName=name
#\u8EAB\u4EFD\u8BC1\u5230\u671F\u65F6\u95F4\u5B57\u6BB5\u540D
certif.expirationDateName=expiryDate
#C-\u8FDD\u7AE0\u8F66\u8F86\u67E5\u8BE2
#\u63A5\u53E3appcode
ALIYUN.CODE=acea1c8811f748b3a65815f11db357c4
#\u8FD4\u56DE\u53C2\u6570\u7C7B\u578B(HTML/JSON/JSONP/XML)
RETURN.TYPE=JSON
rs-website/rs-website-server/src/main/resources/application.yml 0 → 100644
View file @ bcec2f8f
logging:
config: classpath:logback.xml
level:
com.github.wxiaoqi:
debug
com.upyuns.platform.rs:
debug
servlet:
multipart:
# 启用上传处理，默认是true
enabled: true
# 当上传文件达到20MB的时候进行磁盘写入
file-size-threshold: 20MB
# 设置最大的请求文件的大小
max-request-size: 50MB
# 设置单个文件的最大长度
max-file-size: 50MB
\ No newline at end of file
rs-website/rs-website-server/src/main/resources/bootstrap.yml 0 → 100644
View file @ bcec2f8f
#spring:
# application:
# name: vehicle
# cloud:
# nacos:
# config:
# server-addr: 127.0.0.1:8848
# file-extension: yaml
# profiles:
# active: dev
spring:
profiles:
active: dev
application:
name: rs-website
cloud:
nacos:
config:
file-extension: yaml
---
spring:
profiles: dev
cloud:
nacos:
config:
server-addr: 127.0.0.1:8848
#共用配置，暂定一个
shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
namespace: rs-cloud-platform
\ No newline at end of file
rs-website/rs-website-server/src/main/resources/logback.xml 0 → 100644
View file @ bcec2f8f
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false">
<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径 -->
<property name="LOG_HOME" value="${system.log.path:-logs}"/>
<!-- 彩色日志依赖的渲染类 -->
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
<!-- 彩色日志格式 -->
<property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <!--1. 输出到控制台-->
<filter class="com.github.wxiaoqi.security.common.filter.NacosLogFilter"></filter>
<encoder>
<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
<charset>UTF-8</charset> <!-- 设置字符集 -->
</encoder>
</appender>
<appender name="SYSTEM_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"><!-- 按照每天生成日志文件 -->
<filter class="com.github.wxiaoqi.security.common.filter.DenyFilter"></filter>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<FileNamePattern>${LOG_HOME}/sys.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
</encoder>
</appender>
<appender name="WEB_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"><!-- 按照每天生成日志文件 -->
<filter class="com.github.wxiaoqi.security.common.filter.AcceptFilter"></filter>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<FileNamePattern>${LOG_HOME}/log.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
</encoder>
</appender>
<root level="INFO">
<appender-ref ref="STDOUT" />
<appender-ref ref="SYSTEM_FILE" />
<appender-ref ref="WEB_FILE" />
</root>
</configuration>
\ No newline at end of file
rs-website/rs-website-server/src/main/resources/mapper/DemoMapper.xml 0 → 100644
View file @ bcec2f8f
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.upyuns.platform.rs.website.mapper.DemoMapper" >
<resultMap id="BaseResultMap" type="com.upyuns.platform.rs.website.entity.Demo" >
<id column="id" property="id" jdbcType="INTEGER" />
<result column="name" property="name" jdbcType="VARCHAR" />
</resultMap>
</mapper>
\ No newline at end of file
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