Merge remote-tracking branch 'origin/1.0.0' into dev

src/pom.xml

@@ -161,13 +161,6 @@
       <version>1.2.35</version>
     </dependency>
 
-    <!-- log4j-->
-    <!--<dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>${log4j.version}</version>
-    </dependency>-->
-
     <!-- lombok -->
     <dependency>
       <groupId>org.projectlombok</groupId>

src/taoshop-manager/taoshop-manager-web/src/main/java/com/muses/taoshop/manager/web/controller/BaseController.java

 package com.muses.taoshop.manager.web.controller;
 
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.servlet.ModelAndView;
@@ -21,7 +22,7 @@ import javax.servlet.http.HttpServletRequest;
  * </pre>
  */
 public class BaseController {
-    public Logger log = Logger.getLogger(getClass());
+    public Logger log = LoggerFactory.getLogger(BaseController.class);
 
     public void debug(String message , Exception e){
         log.debug(message , e);

src/taoshop-order/src/main/java/com/muses/taoshop/order/web/controller/BaseController.java

 package com.muses.taoshop.order.web.controller;
 
 
-import org.apache.log4j.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.servlet.ModelAndView;
@@ -21,7 +23,7 @@ import javax.servlet.http.HttpServletRequest;
  * </pre>
  */
 public class BaseController {
-    public Logger log = Logger.getLogger(getClass());
+    public Logger log = LoggerFactory.getLogger(BaseController.class);
 
     public void debug(String message , Exception e){
         log.debug(message , e);

src/taoshop-portal/pom.xml

@@ -35,6 +35,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-logging</artifactId>
         </dependency>
+        <!-- thymeleaf-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
 
         <!-- 商品信息服务-->
         <dependency>
@@ -54,15 +59,7 @@
             <artifactId>taoshop-common-core</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <!--<dependency>
-            <groupId>com.muses.taoshop.common</groupId>
-            <artifactId>taoshop-security-core</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
+
 
         <!-- Apache POI -->
         <dependency>

src/taoshop-portal/src/main/resources/application.properties

@@ -2,8 +2,8 @@
 #server.port=8081
 #
 ##logging
-#logging.config=classpath:logback-spring.xml
-#logging.level.com.muses.taoshop.*.mybatis: debug
+##logging.config=classpath:logback-spring.xml
+##logging.level.com.muses.taoshop.*.mybatis: debug
 #
 ## datasource
 #spring.datasource.url=jdbc:mysql://127.0.0.1/taoshop?useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC&useSSL=true

src/taoshop-portal/src/main/resources/application.yml

 server:
   port: 8081
 #logging:
-#  config: classpath:logback_spring.xml
+#  config: classpath:logback_spring.xml.bat
 #  level:
 #    com.muses.taoshop: debug
 #  path: /data/logs

src/taoshop-provider/taoshop-provider-item/pom.xml

@@ -21,41 +21,5 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.xml</include>
-                </includes>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <!-- 设置源文件编译 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <compilerVersion>1.8</compilerVersion>
-                    <encoding>UTF-8</encoding>
-                    <skipMain></skipMain>
-                </configuration>
-            </plugin>
 
-            <!-- 解决资源文件的编码问题 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.2</version>
-                <configuration>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
 </project>
\ No newline at end of file

src/taoshop-provider/taoshop-provider-usc/pom.xml

@@ -24,42 +24,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.xml</include>
-                </includes>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <!-- 设置源文件编译 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <compilerVersion>1.8</compilerVersion>
-                    <encoding>UTF-8</encoding>
-                    <skipMain></skipMain>
-                </configuration>
-            </plugin>
 
-            <!-- 解决资源文件的编码问题 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.2</version>
-                <configuration>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
 
 </project>