2 年前 · 31716933d6
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
 
				         <druid.version>1.1.0</druid.version>
			
 
				         <mybatis.version>1.3.2</mybatis.version>
			
 
				         <jasypt.version>2.0.0</jasypt.version>
			
 
				-        <start-class>com.cbkj.platform.api.PlatformApi</start-class>
			
 
				+        <start-class>com.cbkj.platform.PlatformApi</start-class>
			
 
				     </properties>
			
 
				 
			
 
				     <parent>
			
@@ -175,6 +175,7 @@
 
				     </licenses>
			
 
				 
			
 
				     <build>
			
 
				+        <finalName>tcm-platform-api</finalName>
			
 
				         <plugins>
			
 
				             <plugin>
			
 
				                 <groupId>org.springframework.boot</groupId>
			
--- a/src/main/java/com/cbkj/platform/api/PlatformApi.java
+++ b/src/main/java/com/cbkj/platform/api/PlatformApi.java
--- a/src/main/java/com/cbkj/platform/api/beans/entity/ResEntity.java
+++ b/src/main/java/com/cbkj/platform/api/beans/entity/ResEntity.java
--- a/src/main/java/com/cbkj/platform/api/beans/user/AdminInfo.java
+++ b/src/main/java/com/cbkj/platform/api/beans/user/AdminInfo.java
--- a/src/main/java/com/cbkj/platform/api/config/multipleDataSource/DynamicDataSourceRegister.java
+++ b/src/main/java/com/cbkj/platform/api/config/multipleDataSource/DynamicDataSourceRegister.java
--- a/src/main/java/com/cbkj/platform/api/config/swagger/Swagger2Config.java
+++ b/src/main/java/com/cbkj/platform/api/config/swagger/Swagger2Config.java
--- a/src/main/java/com/cbkj/platform/api/config/utils/Constant.java
+++ b/src/main/java/com/cbkj/platform/api/config/utils/Constant.java
--- a/src/main/java/com/cbkj/platform/api/config/utils/JasyptUtils.java
+++ b/src/main/java/com/cbkj/platform/api/config/utils/JasyptUtils.java
--- a/src/main/java/com/cbkj/platform/api/config/utils/Page.java
+++ b/src/main/java/com/cbkj/platform/api/config/utils/Page.java
--- a/src/main/java/com/cbkj/platform/api/controller/dic/DicDataController.java
+++ b/src/main/java/com/cbkj/platform/api/controller/dic/DicDataController.java
--- a/src/main/java/com/cbkj/platform/api/controller/org/SysAppController.java
+++ b/src/main/java/com/cbkj/platform/api/controller/org/SysAppController.java
--- a/src/main/java/com/cbkj/platform/api/controller/org/SysDepartmentController.java
+++ b/src/main/java/com/cbkj/platform/api/controller/org/SysDepartmentController.java
--- a/src/main/java/com/cbkj/platform/api/controller/org/SysInstitutionController.java
+++ b/src/main/java/com/cbkj/platform/api/controller/org/SysInstitutionController.java
--- a/src/main/java/com/cbkj/platform/api/controller/param/SysParamController.java
+++ b/src/main/java/com/cbkj/platform/api/controller/param/SysParamController.java
--- a/src/main/java/com/cbkj/platform/api/controller/sso/SsoController.java
+++ b/src/main/java/com/cbkj/platform/api/controller/sso/SsoController.java
--- a/src/main/java/com/cbkj/platform/api/controller/user/AdminInfoController.java
+++ b/src/main/java/com/cbkj/platform/api/controller/user/AdminInfoController.java
--- a/src/main/java/com/cbkj/platform/api/controller/user/AdminMenuController.java
+++ b/src/main/java/com/cbkj/platform/api/controller/user/AdminMenuController.java
--- a/src/main/java/com/cbkj/platform/api/mapper/user/AdminInfoMapper.java
+++ b/src/main/java/com/cbkj/platform/api/mapper/user/AdminInfoMapper.java
--- a/src/main/java/com/cbkj/platform/api/service/dic/DicDataService.java
+++ b/src/main/java/com/cbkj/platform/api/service/dic/DicDataService.java
--- a/src/main/java/com/cbkj/platform/api/service/org/SysAppService.java
+++ b/src/main/java/com/cbkj/platform/api/service/org/SysAppService.java
--- a/src/main/java/com/cbkj/platform/api/service/org/SysDepartmentService.java
+++ b/src/main/java/com/cbkj/platform/api/service/org/SysDepartmentService.java
--- a/src/main/java/com/cbkj/platform/api/service/org/SysInstitutionService.java
+++ b/src/main/java/com/cbkj/platform/api/service/org/SysInstitutionService.java
--- a/src/main/java/com/cbkj/platform/api/service/param/SysParamService.java
+++ b/src/main/java/com/cbkj/platform/api/service/param/SysParamService.java
--- a/src/main/java/com/cbkj/platform/api/service/sso/UserService.java
+++ b/src/main/java/com/cbkj/platform/api/service/sso/UserService.java
--- a/src/main/java/com/cbkj/platform/api/service/user/AdminInfoService.java
+++ b/src/main/java/com/cbkj/platform/api/service/user/AdminInfoService.java
--- a/src/main/java/com/cbkj/platform/api/service/user/AdminMenuService.java
+++ b/src/main/java/com/cbkj/platform/api/service/user/AdminMenuService.java
--- a/src/main/java/com/cbkj/platform/config/entity/ResEntity.java
+++ b/src/main/java/com/cbkj/platform/config/entity/ResEntity.java
--- a/src/main/java/com/cbkj/platform/api/config/multipleDataSource/DynamicDataSource.java
+++ b/src/main/java/com/cbkj/platform/api/config/multipleDataSource/DynamicDataSource.java
--- a/src/main/java/com/cbkj/platform/api/config/multipleDataSource/DynamicDataSourceContextHolder.java
+++ b/src/main/java/com/cbkj/platform/api/config/multipleDataSource/DynamicDataSourceContextHolder.java
--- a/src/main/java/com/cbkj/platform/config/multipleDataSource/DynamicDataSourceRegister.java
+++ b/src/main/java/com/cbkj/platform/config/multipleDataSource/DynamicDataSourceRegister.java
--- a/src/main/java/com/cbkj/platform/config/redis/RedisConfig.java
+++ b/src/main/java/com/cbkj/platform/config/redis/RedisConfig.java
--- a/src/main/java/com/cbkj/platform/config/swagger/Swagger2Config.java
+++ b/src/main/java/com/cbkj/platform/config/swagger/Swagger2Config.java
--- a/src/main/java/com/cbkj/platform/config/utils/Constant.java
+++ b/src/main/java/com/cbkj/platform/config/utils/Constant.java
--- a/src/main/java/com/cbkj/platform/config/utils/JasyptUtils.java
+++ b/src/main/java/com/cbkj/platform/config/utils/JasyptUtils.java
--- a/src/main/java/com/cbkj/platform/config/utils/JedisUtil.java
+++ b/src/main/java/com/cbkj/platform/config/utils/JedisUtil.java
--- a/src/main/java/com/cbkj/platform/config/utils/Page.java
+++ b/src/main/java/com/cbkj/platform/config/utils/Page.java
--- a/src/main/java/com/cbkj/platform/sso/conf/Conf.java
+++ b/src/main/java/com/cbkj/platform/sso/conf/Conf.java
--- a/src/main/java/com/cbkj/platform/sso/encryption/BASE64MultipartFile.java
+++ b/src/main/java/com/cbkj/platform/sso/encryption/BASE64MultipartFile.java
--- a/src/main/java/com/cbkj/platform/sso/encryption/Base64Utils.java
+++ b/src/main/java/com/cbkj/platform/sso/encryption/Base64Utils.java
--- a/src/main/java/com/cbkj/platform/sso/encryption/MD5Util.java
+++ b/src/main/java/com/cbkj/platform/sso/encryption/MD5Util.java
--- a/src/main/java/com/cbkj/platform/sso/encryption/RSAEncryption.java
+++ b/src/main/java/com/cbkj/platform/sso/encryption/RSAEncryption.java
--- a/src/main/java/com/cbkj/platform/sso/filter/SsoTokenFilter.java
+++ b/src/main/java/com/cbkj/platform/sso/filter/SsoTokenFilter.java
--- a/src/main/java/com/cbkj/platform/sso/login/SsoTokenLoginHelper.java
+++ b/src/main/java/com/cbkj/platform/sso/login/SsoTokenLoginHelper.java
--- a/src/main/java/com/cbkj/platform/sso/path/PathMatcher.java
+++ b/src/main/java/com/cbkj/platform/sso/path/PathMatcher.java
--- a/src/main/java/com/cbkj/platform/sso/path/impl/AntPathMatcher.java
+++ b/src/main/java/com/cbkj/platform/sso/path/impl/AntPathMatcher.java
--- a/src/main/java/com/cbkj/platform/sso/store/SsoLoginStore.java
+++ b/src/main/java/com/cbkj/platform/sso/store/SsoLoginStore.java
--- a/src/main/java/com/cbkj/platform/sso/store/SsoSessionIdHelper.java
+++ b/src/main/java/com/cbkj/platform/sso/store/SsoSessionIdHelper.java
--- a/src/main/java/com/cbkj/platform/sso/user/SsoUser.java
+++ b/src/main/java/com/cbkj/platform/sso/user/SsoUser.java
--- a/src/main/java/com/cbkj/platform/sso/util/CookieUtil.java
+++ b/src/main/java/com/cbkj/platform/sso/util/CookieUtil.java
--- a/src/main/java/com/cbkj/platform/sso/util/StringUtils.java
+++ b/src/main/java/com/cbkj/platform/sso/util/StringUtils.java
--- a/src/main/resources/mappers/user/AdminInfoMapper.xml
+++ b/src/main/resources/mappers/user/AdminInfoMapper.xml
@@ -134,4 +134,10 @@
 
				         order by app_id, ins_code, dept_id
			
 
				         ) e
			
 
				     </select>
			
 
				+
			
 
				+    <select id="findUser" parameterType="String" resultMap="BaseResultMap">
			
 
				+        select *
			
 
				+        from sys_admin_info
			
 
				+        where user_name = #{userName} and status != '1'
			
 
				+    </select>
			
 
				 </mapper>
			
--- a/src/main/resources/zlogback.xml
+++ b/src/main/resources/zlogback.xml
@@ -144,7 +144,7 @@
 
				 
			
 
				     <!--日志异步到数据库  -->
			
 
				     <!--<appender name="DBAPPENDER" class="ch.qos.logback.classic.db.DBAppender">-->
			
 
				-    <!--<connectionSource class="ch.qos.logback.core.db.DataSourceConnectionSource">-->
			
 
				+    <!--<connectionSource class="ch.qos.logback.sso.db.DataSourceConnectionSource">-->
			
 
				     <!--<TargetDataSource class="com.zaxxer.hikari.HikariDataSource">-->
			
 
				     <!--<driverClassName>com.mysql.jdbc.Driver</driverClassName>-->
			
 
				     <!--<jdbcUrl>jdbc:mysql://localhost:3306/albedo-new?useUnicode=true&amp;characterEncoding=utf8&amp;useSSL=false</jdbcUrl>-->