Progr1mmer hace 6 años
padre
commit
79ee9d93d1

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/saas/dao/SaasDao.java

@ -1,4 +1,4 @@
package com.yihu.jw.base.saas.dao;
package com.yihu.jw.base.dao;
import com.yihu.jw.entity.base.saas.SaasDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

+ 3 - 5
svr/svr-base/src/main/java/com/yihu/jw/base/saas/controller/SaasController.java

@ -1,10 +1,9 @@
package com.yihu.jw.base.saas.controller;
package com.yihu.jw.base.endpoint;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.base.saas.service.SaasService;
import com.yihu.jw.base.service.SaasService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.web.model.Envelop;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.web.model.ListEnvelop;
import com.yihu.jw.web.model.ObjEnvelop;
@ -15,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
/**
@ -23,7 +21,7 @@ import java.util.List;
 */
@RestController
@Api(value = "Saas配置模块", description = "Saas配置模块接口管理", tags = {"wlyy基础服务 - Saas配置模块接口管理"})
public class SaasController extends EnvelopRestEndpoint {
public class SaasEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private SaasService saasService;

+ 2 - 2
svr/svr-base/src/main/java/com/yihu/jw/base/saas/service/SaasService.java

@ -1,7 +1,7 @@
package com.yihu.jw.base.saas.service;
package com.yihu.jw.base.service;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.base.saas.dao.SaasDao;
import com.yihu.jw.base.dao.SaasDao;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.rm.base.BaseRequestMapping;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/util/MessageUtil.java

@ -1,4 +1,4 @@
package com.yihu.jw.util;
package com.yihu.jw.base.util;
import org.dom4j.Document;
import org.dom4j.Element;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxGraphicMessageService.java

@ -6,7 +6,7 @@
//import com.yihu.jw.exception.code.ExceptionCode;
//import com.yihu.base.mysql.query.BaseJpaService;
//import com.yihu.jw.rm.base.WechatRequestMapping;
//import com.yihu.jw.util.MessageUtil;
//import com.yihu.jw.base.util.MessageUtil;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Service;
//import org.springframework.util.StringUtils;

+ 0 - 29
svr/svr-base/src/main/resources/logback/logback.xml

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
		<encoder>
			<pattern>%date{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
			<charset class="java.nio.charset.Charset">UTF-8</charset>
		</encoder>
	</appender>
	<appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
		<file>/tmp/logs/jw/base.log</file>
		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
			<fileNamePattern>/tmp/logs/jw/base.%d{yyyy-MM-dd}.log</fileNamePattern>
		</rollingPolicy>
		<encoder>
			<pattern>%date{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
			<charset class="java.nio.charset.Charset">UTF-8</charset>
		</encoder>
	</appender>
	<!-- project default level -->
	<logger name="com.yihu.jw" level="INFO" />
	<logger name="com.netflix" level="INFO" />
	<logger name="org.apache" level="INFO" />
	<root level="WARN">
		<appender-ref ref="console" />
		<appender-ref ref="rollingFile" />
	</root>
</configuration>