Skip to content

J
jgjk
提交 6319c18a authored 作者: 任建宇's avatar 任建宇
浏览文件
操作

chushib

上级 2171350a
隐藏空白字符变更
内嵌 并排
正在显示 包含 51 行增加 和 51 行删除
app/file/src/main/resources/application.properties
浏览文件 @ 6319c18a
......@@ -23,8 +23,8 @@
#spring.redis.sentinel.nodes=10.189.80.25:26379,10.189.80.26:26379,10.189.80.27:26378
file-root-path=/opt/upload/hxwza/
dist-root-path=/opt/view/hxwza/
file-root-path=/opt/upload/jgjk/
dist-root-path=/opt/view/jgjk/
# ueditor路径引用
ue-res-server=http://test10.zhongdianyun.com/file/
ftp-root-path =/home/lizhuo/
......
app/file/src/main/resources/application.yml
浏览文件 @ 6319c18a
......@@ -6,7 +6,7 @@ ribbon:
ReadTimeout: 600000 #服务间连接超时时间
spring:
resources:
static-locations: classpath:/static/,classpath:/META-INF/resources/,file:/opt/upload/hxwza/
static-locations: classpath:/static/,classpath:/META-INF/resources/,file:/opt/upload/jgjk/
servlet:
multipart:
enabled: true
......
app/file/src/main/resources/logback.xml
浏览文件 @ 6319c18a
......@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.padual.com/java/logback.xsd"
debug="false" scan="true" scanPeriod="30 second">
<property name="ROOT" value="/opt/logs/hxwza/file/" />
<property name="ROOT" value="/opt/logs/jgjk/file/" />
<property name="FILESIZE" value="10MB" />
<property name="MAXHISTORY" value="10" />
<timestamp key="DATETIME" datePattern="yyyy-MM-dd HH:mm:ss" />
......
app/member/src/main/resources/logback.xml
浏览文件 @ 6319c18a
......@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.padual.com/java/logback.xsd"
debug="false" scan="true" scanPeriod="30 second">
<property name="ROOT" value="/opt/logs/hxwza/member/" />
<property name="ROOT" value="/opt/logs/jgjk/member/" />
<property name="FILESIZE" value="10MB" />
<property name="MAXHISTORY" value="60" />
<property name="DATETIME" value="yyyy-MM-dd HH:mm:ss" />
......
app/order/src/main/resources/logback.xml
浏览文件 @ 6319c18a
......@@ -5,7 +5,7 @@
debug="false" scan="true" scanPeriod="30 second">
<!--读取配置中心的属性-->
<springProperty scope="context" name="name" source="spring.application.name"/>
<property name="ROOT" value="/opt/logs/hxwza/order/" />
<property name="ROOT" value="/opt/logs/jgjk/order/" />
<property name="FILESIZE" value="50MB" />
<property name="MAXHISTORY" value="100" />
<property name="DATETIME" value="yyyy-MM-dd HH:mm:ss" />
......
app/pay/src/main/resources/logback.xml
浏览文件 @ 6319c18a
......@@ -5,7 +5,7 @@
debug="false" scan="true" scanPeriod="30 second">
<!--读取配置中心的属性-->
<springProperty scope="context" name="name" source="spring.application.name"/>
<property name="ROOT" value="/opt/logs/hxwza/pay/" />
<property name="ROOT" value="/opt/logs/jgjk/pay/" />
<property name="FILESIZE" value="10MB" />
<property name="MAXHISTORY" value="60" />
<property name="DATETIME" value="yyyy-MM-dd HH:mm:ss" />
......
app/resource/src/main/java/com/zrqx/resource/bg/controller/task/DatabaseController.java
浏览文件 @ 6319c18a
......@@ -35,8 +35,8 @@ import io.swagger.annotations.ApiOperation;
@Api(description = "资源管理-导出任务")
public class DatabaseController {
private String url = "jdbc:mysql://192.168.2.229:3306/hxwza_resource";
private String fileurl = "jdbc:mysql://192.168.2.229:3306/hxwza_file";
private String url = "jdbc:mysql://192.168.2.229:3306/jgjk_resource";
private String fileurl = "jdbc:mysql://192.168.2.229:3306/jgjk_file";
private String userName = "root";
private String password = "zrqx2020";
......@@ -46,7 +46,7 @@ public class DatabaseController {
HttpSession session = request.getSession();
session.setAttribute("percentage", "0%");
String basePath = "/opt/upload/hxwza/";
String basePath = "/opt/upload/jgjk/";
String zipPath = "zip/" + UUIDUtil.getUUID() + ".zip";
String zipFileName = basePath + zipPath;
ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(zipFileName)));
......@@ -124,8 +124,8 @@ public class DatabaseController {
// 前置路径
String command = "/usr/bin/mysqldump -f -c -q ";
Process process = null;
String fileinfo = "-uroot -proot -t -h192.168.2.229 hxwza-file";
String resource = "-uroot -proot -t -h192.168.2.229 hxwza-resource";
String fileinfo = "-uroot -proot -t -h192.168.2.229 jgjk-file";
String resource = "-uroot -proot -t -h192.168.2.229 jgjk-resource";
// 导出fileinfo库
Set<String> fileList = new HashSet<String>();
if (codes.contains(",")) {
......@@ -556,7 +556,7 @@ public class DatabaseController {
}
}
//打包生成zip
String basePath = "/opt/upload/hxwza/";
String basePath = "/opt/upload/jgjk/";
String zipPath = "zip/" + UUIDUtil.getUUID() + ".zip";
String zipFileName = basePath + zipPath;
ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(zipFileName)));
......
app/resource/src/main/java/com/zrqx/resource/bg/mapper/ResourceRelationMapper.java
浏览文件 @ 6319c18a
......@@ -113,7 +113,7 @@ public interface ResourceRelationMapper extends BaseMapper<ResourceRelation> {
*/
@Select("<script>"
+ "select a.id,a.name,a.status,a.uploadTime "
+ "FROM hxwza_sysuser.sys_bulletin_content a "
+ "FROM jgjk_sysuser.sys_bulletin_content a "
+ " where 1 = 1 and a.status = 1 "
+ " like(a.name,form.name) "
+ "<if test='form.ids != null and form.ids.size > 0'>"
......
app/resource/src/main/java/com/zrqx/resource/bg/mapper/audiolibrary/AudioLibraryMapper.java
浏览文件 @ 6319c18a
......@@ -57,11 +57,11 @@ public interface AudioLibraryMapper extends BaseMapper<AudioLibrary> {
*/
@Select("<script>"
+ "select DISTINCT a.id,a.name,a.uploadTime,a.cover,a.resourceType,browseNum, "
+ "(SELECT COUNT(*) FROM hxwza_order.ord_orderinfo c LEFT JOIN hxwza_order.ord_order b ON c.orderId = b.id WHERE b.status = 6 AND c.goodsid = a.id) tradeNum, "
+ "(SELECT COUNT(*) FROM hxwza_resource.res_record WHERE goodsId = a.id) readersNum, "
+ "(SELECT COUNT(*) FROM jgjk_order.ord_orderinfo c LEFT JOIN jgjk_order.ord_order b ON c.orderId = b.id WHERE b.status = 6 AND c.goodsid = a.id) tradeNum, "
+ "(SELECT COUNT(*) FROM jgjk_resource.res_record WHERE goodsId = a.id) readersNum, "
+ "shares, "
+ "(SELECT COUNT(*) FROM hxwza_resource.res_resource_relation WHERE objectId = a.id) relatedNum "
+ "from hxwza_resource.res_Audio_Library a left join hxwza_resource.res_Audio_Library_Diy_Type ad "
+ "(SELECT COUNT(*) FROM jgjk_resource.res_resource_relation WHERE objectId = a.id) relatedNum "
+ "from jgjk_resource.res_Audio_Library a left join jgjk_resource.res_Audio_Library_Diy_Type ad "
+ "on a.id = ad.audioId "
+ "where 1=1 "
+ " rlike(ad.code,form.diyTypeCode) "
......@@ -79,11 +79,11 @@ public interface AudioLibraryMapper extends BaseMapper<AudioLibrary> {
*/
@Select("<script>"
+ "select DISTINCT a.id,a.name,a.uploadTime,a.cover,a.resourceType,browseNum, "
+ "(SELECT COUNT(*) FROM hxwza_order.ord_orderinfo c LEFT JOIN hxwza_order.ord_order b ON c.orderId = b.id WHERE b.status = 6 AND c.goodsid = a.id) tradeNum, "
+ "(SELECT COUNT(*) FROM hxwza_resource.res_record WHERE goodsId = a.id) readersNum, "
+ "(SELECT COUNT(*) FROM jgjk_order.ord_orderinfo c LEFT JOIN jgjk_order.ord_order b ON c.orderId = b.id WHERE b.status = 6 AND c.goodsid = a.id) tradeNum, "
+ "(SELECT COUNT(*) FROM jgjk_resource.res_record WHERE goodsId = a.id) readersNum, "
+ "shares, "
+ "(SELECT COUNT(*) FROM hxwza_resource.res_resource_relation WHERE objectId = a.id) relatedNum "
+ "from hxwza_resource.res_Audio_Library a left join hxwza_resource.res_Audio_Library_Diy_Type ad "
+ "(SELECT COUNT(*) FROM jgjk_resource.res_resource_relation WHERE objectId = a.id) relatedNum "
+ "from jgjk_resource.res_Audio_Library a left join jgjk_resource.res_Audio_Library_Diy_Type ad "
+ "on a.id = ad.audioId "
+ "where 1=1 "
+ " rlike(ad.code,form.diyTypeCode) "
......
app/resource/src/main/java/com/zrqx/resource/bg/mapper/ebook/EbookMapper.java
浏览文件 @ 6319c18a
......@@ -109,13 +109,13 @@ public interface EbookMapper extends BaseMapper<Ebook>{
@Select("<script>"
+ "SELECT DISTINCT bb.id,bb.name,bb.resourceType,be.cover,be.uploadTime,browseNum, "
+ "(SELECT COUNT(*) FROM hxwza_order.ord_orderinfo a LEFT JOIN hxwza_order.ord_order b ON a.orderId = b.id WHERE b.status = 6 AND a.goodsid = bb.id) tradeNum, "
+ "(SELECT COUNT(*) FROM hxwza_resource.res_record WHERE goodsId = bb.id) readersNum, "
+ "(SELECT COUNT(*) FROM jgjk_order.ord_orderinfo a LEFT JOIN jgjk_order.ord_order b ON a.orderId = b.id WHERE b.status = 6 AND a.goodsid = bb.id) tradeNum, "
+ "(SELECT COUNT(*) FROM jgjk_resource.res_record WHERE goodsId = bb.id) readersNum, "
+ "shares, "
+ "(SELECT COUNT(*) FROM hxwza_resource.res_resource_relation WHERE objectId = bb.id) relatedNum "
+ " FROM hxwza_resource.res_book bb "
+ " LEFT JOIN hxwza_resource.res_ebook be ON bb.id = be.id "
+ " LEFT JOIN hxwza_resource.res_ebook_diy_type bdt ON be.id = bdt.ebookid "
+ "(SELECT COUNT(*) FROM jgjk_resource.res_resource_relation WHERE objectId = bb.id) relatedNum "
+ " FROM jgjk_resource.res_book bb "
+ " LEFT JOIN jgjk_resource.res_ebook be ON bb.id = be.id "
+ " LEFT JOIN jgjk_resource.res_ebook_diy_type bdt ON be.id = bdt.ebookid "
+ " WHERE 1 = 1 "
+ " rlike(bdt.code,form.diyTypeCode) "
+ " like(bb.name,form.name) "
......@@ -132,13 +132,13 @@ public interface EbookMapper extends BaseMapper<Ebook>{
@Select("<script>"
+ "SELECT DISTINCT bb.id,bb.name,bb.resourceType,be.cover,be.uploadTime,browseNum, "
+ "(SELECT COUNT(*) FROM hxwza_order.ord_orderinfo a LEFT JOIN hxwza_order.ord_order b ON a.orderId = b.id WHERE b.status = 6 AND a.goodsid = bb.id) tradeNum, "
+ "(SELECT COUNT(*) FROM hxwza_resource.res_record WHERE goodsId = bb.id) readersNum, "
+ "(SELECT COUNT(*) FROM jgjk_order.ord_orderinfo a LEFT JOIN jgjk_order.ord_order b ON a.orderId = b.id WHERE b.status = 6 AND a.goodsid = bb.id) tradeNum, "
+ "(SELECT COUNT(*) FROM jgjk_resource.res_record WHERE goodsId = bb.id) readersNum, "
+ "shares, "
+ "(SELECT COUNT(*) FROM hxwza_resource.res_resource_relation WHERE objectId = bb.id) relatedNum "
+ " FROM hxwza_resource.res_book bb "
+ " LEFT JOIN hxwza_resource.res_ebook be ON bb.id = be.id "
+ " LEFT JOIN hxwza_resource.res_ebook_diy_type bdt ON be.id = bdt.ebookid "
+ "(SELECT COUNT(*) FROM jgjk_resource.res_resource_relation WHERE objectId = bb.id) relatedNum "
+ " FROM jgjk_resource.res_book bb "
+ " LEFT JOIN jgjk_resource.res_ebook be ON bb.id = be.id "
+ " LEFT JOIN jgjk_resource.res_ebook_diy_type bdt ON be.id = bdt.ebookid "
+ " WHERE 1 = 1 "
+ " rlike(bdt.code,form.diyTypeCode) "
+ " like(bb.name,form.name) "
......
app/resource/src/main/java/com/zrqx/resource/bg/mapper/videolibrary/VideoLibraryMapper.java
浏览文件 @ 6319c18a
......@@ -90,11 +90,11 @@ public interface VideoLibraryMapper extends BaseMapper<VideoLibrary> {
*/
@Select("<script>"
+ "select DISTINCT a.id,a.name,a.uploadTime,a.cover,a.resourceType,browseNum, "
+ "(SELECT COUNT(*) FROM hxwza_order.ord_orderinfo c LEFT JOIN hxwza_order.ord_order b ON c.orderId = b.id WHERE b.status = 6 AND c.goodsid = a.id) tradeNum, "
+ "(SELECT COUNT(*) FROM hxwza_resource.res_record WHERE goodsId = a.id) readersNum, "
+ "(SELECT COUNT(*) FROM jgjk_order.ord_orderinfo c LEFT JOIN jgjk_order.ord_order b ON c.orderId = b.id WHERE b.status = 6 AND c.goodsid = a.id) tradeNum, "
+ "(SELECT COUNT(*) FROM jgjk_resource.res_record WHERE goodsId = a.id) readersNum, "
+ "shares, "
+ "(SELECT COUNT(*) FROM hxwza_resource.res_resource_relation WHERE objectId = a.id) relatedNum "
+ "from hxwza_resource.res_Video_Library a left join hxwza_resource.res_Video_Library_Diy_Type ad "
+ "(SELECT COUNT(*) FROM jgjk_resource.res_resource_relation WHERE objectId = a.id) relatedNum "
+ "from jgjk_resource.res_Video_Library a left join jgjk_resource.res_Video_Library_Diy_Type ad "
+ "on a.id = ad.videoId "
+ "where 1=1 "
+ " rlike(ad.code,form.diyTypeCode) "
......@@ -112,11 +112,11 @@ public interface VideoLibraryMapper extends BaseMapper<VideoLibrary> {
*/
@Select("<script>"
+ "select DISTINCT a.id,a.name,a.uploadTime,a.cover,a.resourceType,browseNum, "
+ "(SELECT COUNT(*) FROM hxwza_order.ord_orderinfo c LEFT JOIN hxwza_order.ord_order b ON c.orderId = b.id WHERE b.status = 6 AND c.goodsid = a.id) tradeNum, "
+ "(SELECT COUNT(*) FROM hxwza_resource.res_record WHERE goodsId = a.id) readersNum, "
+ "(SELECT COUNT(*) FROM jgjk_order.ord_orderinfo c LEFT JOIN jgjk_order.ord_order b ON c.orderId = b.id WHERE b.status = 6 AND c.goodsid = a.id) tradeNum, "
+ "(SELECT COUNT(*) FROM jgjk_resource.res_record WHERE goodsId = a.id) readersNum, "
+ "shares, "
+ "(SELECT COUNT(*) FROM hxwza_resource.res_resource_relation WHERE objectId = a.id) relatedNum "
+ "from hxwza_resource.res_Video_Library a left join hxwza_resource.res_Video_Library_Diy_Type ad "
+ "(SELECT COUNT(*) FROM jgjk_resource.res_resource_relation WHERE objectId = a.id) relatedNum "
+ "from jgjk_resource.res_Video_Library a left join jgjk_resource.res_Video_Library_Diy_Type ad "
+ "on a.id = ad.videoId "
+ "where 1=1 "
+ " rlike(ad.code,form.diyTypeCode) "
......
app/resource/src/main/java/com/zrqx/resource/commons/util/WebTTSWSUtil.java
浏览文件 @ 6319c18a
......@@ -42,7 +42,7 @@ public class WebTTSWSUtil {
private static final String appid = "5f7ffb9d";//到控制台-语音合成页面获取
private static final String apiSecret = "6047151386cdb9d8eeb782c45ef03af5";//到控制台-语音合成页面获取
private static final String apiKey = "d479cc02d13904273bad7021943a8e2b";//到控制台-语音合成页面获取
private static final String audioPath = "/home/upload/hxwza/audio/";//音频地址
private static final String audioPath = "/home/upload/jgjk/audio/";//音频地址
public static final Gson json = new Gson();
private static final Logger logger = LoggerFactory.getLogger(WebTTSWSUtil.class);
public static String textToAudio(String text,String filePath,String fileName) throws Exception {
......
app/resource/src/main/java/com/zrqx/resource/fg/mapper/ebook/FgEbookMapper.java
浏览文件 @ 6319c18a
......@@ -233,9 +233,9 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
+ "SELECT DISTINCT bb.id, bb.name, a.authorId, a.author, bb.translatorId, bb.translator, "
+ "bb.publisher,DATE_FORMAT(bb.publishTime,'%Y-%m-%d') publishTime, bb.status, bb.resourceType, be.priceOption, be.realPrice,be.price,be.cover, be.bookStatus, be.browseNum,"
+ "qr.qrCode "
+ "FROM hxwza_resource.res_book bb "
+ "LEFT JOIN hxwza_resource.res_ebook be ON bb.id = be.id "
+ "LEFT JOIN hxwza_resource.res_qr_code qr ON be.id = qr.resourceId "
+ "FROM jgjk_resource.res_book bb "
+ "LEFT JOIN jgjk_resource.res_ebook be ON bb.id = be.id "
+ "LEFT JOIN jgjk_resource.res_qr_code qr ON be.id = qr.resourceId "
+ "LEFT JOIN (SELECT resourceId,authorId,author FROM res_relation_author GROUP BY resourceId) a on be.id = a.resourceId "
+ "WHERE be.bookStatus = 1 "
+ "<if test='form.ids != null and form.ids.size > 0' >"
......
app/resource/src/main/resources/application.properties
浏览文件 @ 6319c18a
qrcode-upload-path=/opt/upload/hxwza/qr
qrcode-upload-path=/opt/upload/jgjk/qr
qrcode-path=http://localhost/file
realm-name-path=http://test10.zhongdianyun.com
app/resource/src/main/resources/logback.xml
浏览文件 @ 6319c18a
......@@ -5,7 +5,7 @@
debug="false" scan="true" scanPeriod="30 second">
<!--读取配置中心的属性-->
<springProperty scope="context" name="name" source="spring.application.name"/>
<property name="ROOT" value="/opt/logs/hxwza/resource/" />
<property name="ROOT" value="/opt/logs/jgjk/resource/" />
<property name="FILESIZE" value="10MB" />
<property name="MAXHISTORY" value="60" />
<property name="DATETIME" value="yyyy-MM-dd HH:mm:ss" />
......
app/statistics/src/main/resources/logback.xml
浏览文件 @ 6319c18a
......@@ -6,7 +6,7 @@
<!--读取配置中心的属性-->
<springProperty scope="context" name="name" source="spring.application.name"/>
<property name="PROJECT" value="statistics" />
<property name="ROOT" value="/opt/logs/hxwza/statistics/" />
<property name="ROOT" value="/opt/logs/jgjk/statistics/" />
<property name="FILESIZE" value="10MB" />
<property name="MAXHISTORY" value="10" />
<timestamp key="DATETIME" datePattern="yyyy-MM-dd HH:mm:ss" />
......
app/sysuser/src/main/resources/logback.xml
浏览文件 @ 6319c18a
......@@ -5,7 +5,7 @@
debug="false" scan="true" scanPeriod="30 second">
<!--读取配置中心的属性-->
<springProperty scope="context" name="name" source="spring.application.name"/>
<property name="ROOT" value="/opt/logs/hxwza/sysuser/" />
<property name="ROOT" value="/opt/logs/jgjk/sysuser/" />
<property name="FILESIZE" value="10MB" />
<property name="MAXHISTORY" value="60" />
<property name="DATETIME" value="yyyy-MM-dd HH:mm:ss" />
......
app/third/src/main/resources/logback.xml
浏览文件 @ 6319c18a
......@@ -5,7 +5,7 @@
debug="false" scan="true" scanPeriod="30 second">
<!--读取配置中心的属性-->
<springProperty scope="context" name="name" source="spring.application.name"/>
<property name="ROOT" value="/opt/logs/hxwza/third/"/>
<property name="ROOT" value="/opt/logs/jgjk/third/"/>
<property name="FILESIZE" value="10MB" />
<property name="MAXHISTORY" value="60" />
<property name="DATETIME" value="yyyy-MM-dd HH:mm:ss" />
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论