瀏覽代碼

伊宁项目更改相关 license代码相关 引入第三方jar包并编译打包

1037015548@qq.com 1 年之前
父節點
當前提交
f06fd0b2a4

+ 1 - 0
license.origin

@@ -0,0 +1 @@
+ZjFYOhsmWgLVZ6hY3grnsxPlYbECkBgSxCiBMqmxMHTFjyBI+uL0Cv6nEFOErjYxvrrOaJLINd/znRYnvSuRftlcGXtuWfLvNLoBL8Tj8FFtYINgr+zY2MBJGVv4RykW9UodQLeEy7unm39jljcvXIMRWHG4/xwqh1eRbelFj8uf0mI5Q82BcF5m1OfoQmOR/im0cUbnmWgHz4KgiPkzBg==

+ 9 - 0
pom.xml

@@ -229,6 +229,15 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
+            <!--用于打包是将第三方jar包一同打包-->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.1.RELEASE</version>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

ruoyi-framework/lib/gbase.1.0.1.jar → ruoyi-framework/libs/gbase.1.0.1.jar


+ 5 - 34
ruoyi-framework/pom.xml

@@ -77,26 +77,19 @@
             <artifactId>ruoyi-system</artifactId>
         </dependency>
 
-        <!--外部jar坐标,用于maven编译打包-->
+        <!--外部jar坐标,用于maven编译-->
         <dependency>
-            <groupId>com.gbase</groupId>
+            <groupId>org.gbase</groupId>
             <artifactId>gbase</artifactId>
+            <version>1.0.1</version>
             <scope>system</scope>
-            <version>14.7.0</version>
-            <!-- ${pom.basedir}:此pom.xml文件所在的项目模块路径 -->
-            <systemPath>${pom.basedir}/lib/gbase.1.0.1.jar</systemPath>
+            <systemPath>${pom.basedir}/libs/gbase.1.0.1.jar</systemPath>
         </dependency>
     </dependencies>
     <build>
+        <finalName>${project.artifactId}</finalName>
         <resources>
             <resource>
-                <directory>${project.basedir}/libs</directory>
-                <targetPath>BOOT-INF/lib/</targetPath>
-                <includes>
-                    <include>**/*.jar</include>
-                </includes>
-            </resource>
-            <resource>
                 <directory>${project.basedir}/license</directory>
                 <targetPath>BOOT-INF/license/</targetPath>
                 <includes>
@@ -104,27 +97,5 @@
                 </includes>
             </resource>
         </resources>
-        <plugins>
-            <!--用于maven编译打包-->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <encoding>UTF-8</encoding>
-                    <compilerArguments>
-                        <extdirs>${project.basedir}/lib</extdirs>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <includeSystemScope>true</includeSystemScope>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 </project>

+ 1 - 2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/license/GlobalData.java

@@ -1,7 +1,5 @@
 package com.ruoyi.framework.config.license;
 
-import com.global.base.log.LogLevelFlag;
-import com.global.base.log.LogPrintMgr;
 import com.global.base.tools.AESUtil;
 import com.global.base.tools.FastJsonUtil;
 import org.slf4j.Logger;
@@ -69,6 +67,7 @@ public class GlobalData {
                 }
                 licenseInit.invoke(null, licenseObj);
             }catch (Exception e){
+                ACCESS_LOG.info("licenseInitError:"+e.getLocalizedMessage());
                 e.printStackTrace();
             }