Prechádzať zdrojové kódy

伊宁项目更改相关 license代码相关

1037015548@qq.com 1 rok pred
rodič
commit
e7775d69b8

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ForgetPasswordController.java

@@ -163,7 +163,7 @@ public class ForgetPasswordController extends BaseController
        int result=forgetPasswordService.updateForgetPassword(forgetPassword);
        if(result>0){
            ForgetPassword trueFP = forgetPasswordService.selectForgetPasswordById(forgetPassword.getpId());
-           if(ObjectUtils.isEmpty(trueFP)){
+           if(org.springframework.util.ObjectUtils.isEmpty(trueFP)){
                 return error("该用户忘记密码操作信息不存在,请重试");
            }
            //修改用户表密码,再不修改密码的前提下重新加密存入,新的md5串, 已修改bug LX 2月21

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -350,7 +350,7 @@ public class SysUserController extends BaseController
     {
         SysDept deptParent = deptService.selectDeptById(deptId);//节点信息
         //如果节点信息不存在, 那么就默认查parentid=0的唯一根节点, 避免报错
-        if(ObjectUtils.isEmpty(deptParent)){
+        if(org.springframework.util.ObjectUtils.isEmpty(deptParent)){
             //此查询条件查询出来的数据只会有一条
             SysDept deptQuery = new SysDept();
             deptQuery.setParentId(0L);

+ 38 - 0
ruoyi-framework/pom.xml

@@ -77,10 +77,26 @@
             <artifactId>ruoyi-system</artifactId>
         </dependency>
 
+        <!--外部jar坐标,用于maven编译打包-->
+        <dependency>
+            <groupId>com.gbase</groupId>
+            <artifactId>gbase</artifactId>
+            <scope>system</scope>
+            <version>14.7.0</version>
+            <!-- ${pom.basedir}:此pom.xml文件所在的项目模块路径 -->
+            <systemPath>${pom.basedir}/lib/gbase.1.0.1.jar</systemPath>
+        </dependency>
     </dependencies>
     <build>
         <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>
@@ -88,5 +104,27 @@
                 </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 - 1
ruoyi-framework/src/main/java/com/ruoyi/framework/config/license/GlobalData.java

@@ -20,7 +20,7 @@ import java.util.Map;
  * @Version V1.0
  **/
 public class GlobalData {
-    private volatile boolean mBLicenseSwitch = false;      //license验证开关,对***.jar所在目录下的license.origin文件进行验证
+    private volatile boolean mBLicenseSwitch = true;      //license验证开关,对***.jar所在目录下的license.origin文件进行验证
     private Method licenseInit = null, licenseCheck = null, licenseGetKey = null;
     private volatile boolean mBSwitchTraceLog = true;       //是否开启基于TraceId的日志记录
     public static final Logger ACCESS_LOG = LoggerFactory.getLogger("sys-access");