3 年前 · 99d37b5539
--- a/coffee-admin/.gitignore
+++ b/coffee-admin/.gitignore
--- a/coffee-admin/Dockerfile
+++ b/coffee-admin/Dockerfile
--- a/coffee-admin/pom.xml
+++ b/coffee-admin/pom.xml
@@ -3,24 +3,24 @@
 
				          xmlns="http://maven.apache.org/POM/4.0.0"
			
 
				          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
			
 
				     <parent>
			
 
				-        <artifactId>coffee-boot</artifactId>
			
 
				-        <groupId>com.coffee</groupId>
			
 
				+        <artifactId>nb-root</artifactId>
			
 
				+        <groupId>com.tuoren</groupId>
			
 
				         <version>1.0</version>
			
 
				     </parent>
			
 
				     <modelVersion>4.0.0</modelVersion>
			
 
				     <packaging>jar</packaging>
			
 
				-    <artifactId>coffee-admin</artifactId>
			
 
				+    <artifactId>nb-admin</artifactId>
			
 
				 
			
 
				     <dependencies>
			
 
				         <!-- 核心模块 -->
			
 
				         <dependency>
			
 
				-            <groupId>com.coffee</groupId>
			
 
				-            <artifactId>coffee-framework</artifactId>
			
 
				+            <groupId>com.tuoren</groupId>
			
 
				+            <artifactId>nb-framework</artifactId>
			
 
				         </dependency>
			
 
				         <!-- OSS文件存储模块 -->
			
 
				         <dependency>
			
 
				-            <groupId>com.coffee</groupId>
			
 
				-            <artifactId>coffee-oss</artifactId>
			
 
				+            <groupId>com.tuoren</groupId>
			
 
				+            <artifactId>nb-oss</artifactId>
			
 
				         </dependency>
			
 
				 
			
 
				         <dependency>
			
--- a/coffee-admin/src/main/java/com/coffee/admin/AdminApplication.java
+++ b/coffee-admin/src/main/java/com/coffee/admin/AdminApplication.java
--- a/coffee-admin/src/main/java/com/coffee/admin/StartUpRunner.java
+++ b/coffee-admin/src/main/java/com/coffee/admin/StartUpRunner.java
--- a/coffee-admin/src/main/java/com/coffee/admin/controller/IndexController.java
+++ b/coffee-admin/src/main/java/com/coffee/admin/controller/IndexController.java
--- a/coffee-admin/src/main/java/com/coffee/admin/controller/common/CommonController.java
+++ b/coffee-admin/src/main/java/com/coffee/admin/controller/common/CommonController.java
--- a/coffee-admin/src/main/java/com/coffee/admin/controller/monitor/OnlineUserController.java
+++ b/coffee-admin/src/main/java/com/coffee/admin/controller/monitor/OnlineUserController.java
--- a/coffee-admin/src/main/java/com/coffee/admin/controller/system/SysLoginController.java
+++ b/coffee-admin/src/main/java/com/coffee/admin/controller/system/SysLoginController.java
--- a/coffee-admin/src/main/resources/application-dev.yml
+++ b/coffee-admin/src/main/resources/application-dev.yml
--- a/coffee-admin/src/main/resources/application-prod.yml
+++ b/coffee-admin/src/main/resources/application-prod.yml
--- a/coffee-admin/src/main/resources/application-test.yml
+++ b/coffee-admin/src/main/resources/application-test.yml
--- a/coffee-admin/src/main/resources/application.yml
+++ b/coffee-admin/src/main/resources/application.yml
--- a/coffee-admin/src/main/resources/logback.xml
+++ b/coffee-admin/src/main/resources/logback.xml
--- a/coffee-admin/src/main/resources/python/jython-standalone-2.7.1.jar
+++ b/coffee-admin/src/main/resources/python/jython-standalone-2.7.1.jar
--- a/coffee-admin/src/main/resources/python/xmltodict.py
+++ b/coffee-admin/src/main/resources/python/xmltodict.py
--- a/coffee-admin/src/main/test/java/com/coffee/admin/BusDeviceRegisterTest.java
+++ b/coffee-admin/src/main/test/java/com/coffee/admin/BusDeviceRegisterTest.java
--- a/coffee-admin/src/test/java/com/coffee/admin/AliyunTest.java
+++ b/coffee-admin/src/test/java/com/coffee/admin/AliyunTest.java
--- a/coffee-admin/src/test/java/com/coffee/admin/BusClinicTest.java
+++ b/coffee-admin/src/test/java/com/coffee/admin/BusClinicTest.java
--- a/coffee-admin/src/test/java/com/coffee/admin/BusDeviceAlarmTest.java
+++ b/coffee-admin/src/test/java/com/coffee/admin/BusDeviceAlarmTest.java
--- a/coffee-admin/src/test/java/com/coffee/admin/BusDeviceTest.java
+++ b/coffee-admin/src/test/java/com/coffee/admin/BusDeviceTest.java
--- a/coffee-admin/src/test/java/com/coffee/admin/BusHospitalLogTest.java
+++ b/coffee-admin/src/test/java/com/coffee/admin/BusHospitalLogTest.java
--- a/coffee-admin/src/test/java/com/coffee/admin/BusHospitalTest.java
+++ b/coffee-admin/src/test/java/com/coffee/admin/BusHospitalTest.java
--- a/coffee-admin/src/test/java/com/coffee/admin/BusPatientTest.java
+++ b/coffee-admin/src/test/java/com/coffee/admin/BusPatientTest.java
--- a/coffee-admin/src/test/java/com/coffee/admin/FileUploadTest.java
+++ b/coffee-admin/src/test/java/com/coffee/admin/FileUploadTest.java
--- a/coffee-admin/src/test/java/com/coffee/admin/HisStrategyTest.java
+++ b/coffee-admin/src/test/java/com/coffee/admin/HisStrategyTest.java
--- a/coffee-admin/src/test/java/com/coffee/admin/SpringBootApplicationTests.java
+++ b/coffee-admin/src/test/java/com/coffee/admin/SpringBootApplicationTests.java
--- a/coffee-codegen/pom.xml
+++ b/coffee-codegen/pom.xml
@@ -3,13 +3,13 @@
 
				          xmlns="http://maven.apache.org/POM/4.0.0"
			
 
				          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
			
 
				     <parent>
			
 
				-        <artifactId>coffee-boot</artifactId>
			
 
				-        <groupId>com.coffee</groupId>
			
 
				+        <artifactId>nb-root</artifactId>
			
 
				+        <groupId>com.tuoren</groupId>
			
 
				         <version>1.0</version>
			
 
				     </parent>
			
 
				     <modelVersion>4.0.0</modelVersion>
			
 
				 
			
 
				-    <artifactId>coffee-codegen</artifactId>
			
 
				+    <artifactId>nb-codegen</artifactId>
			
 
				 
			
 
				     <dependencies>
			
 
				         <dependency>
			
@@ -29,8 +29,8 @@
 
				             <artifactId>velocity-engine-core</artifactId>
			
 
				         </dependency>
			
 
				         <dependency>
			
 
				-            <groupId>com.coffee</groupId>
			
 
				-            <artifactId>coffee-common</artifactId>
			
 
				+            <groupId>com.tuoren</groupId>
			
 
				+            <artifactId>nb-common</artifactId>
			
 
				         </dependency>
			
 
				     </dependencies>
			
 
				 
			
--- a/coffee-codegen/src/main/java/com/coffee/codegen/CodeGenerator.java
+++ b/coffee-codegen/src/main/java/com/coffee/codegen/CodeGenerator.java
--- a/coffee-codegen/src/main/resources/templates/addDTO.java.vm
+++ b/coffee-codegen/src/main/resources/templates/addDTO.java.vm
--- a/coffee-codegen/src/main/resources/templates/controller.java.vm
+++ b/coffee-codegen/src/main/resources/templates/controller.java.vm
--- a/coffee-codegen/src/main/resources/templates/editDTO.java.vm
+++ b/coffee-codegen/src/main/resources/templates/editDTO.java.vm
--- a/coffee-codegen/src/main/resources/templates/entity.java.vm
+++ b/coffee-codegen/src/main/resources/templates/entity.java.vm
--- a/coffee-codegen/src/main/resources/templates/mapper.java.vm
+++ b/coffee-codegen/src/main/resources/templates/mapper.java.vm
--- a/coffee-codegen/src/main/resources/templates/mapper.xml.vm
+++ b/coffee-codegen/src/main/resources/templates/mapper.xml.vm
--- a/coffee-codegen/src/main/resources/templates/queryDTO.java.vm
+++ b/coffee-codegen/src/main/resources/templates/queryDTO.java.vm
--- a/coffee-codegen/src/main/resources/templates/service.java.vm
+++ b/coffee-codegen/src/main/resources/templates/service.java.vm
--- a/coffee-codegen/src/main/resources/templates/serviceImpl.java.vm
+++ b/coffee-codegen/src/main/resources/templates/serviceImpl.java.vm
--- a/coffee-codegen/src/main/resources/templates/sql.vm
+++ b/coffee-codegen/src/main/resources/templates/sql.vm
--- a/coffee-codegen/src/main/resources/templates/vue/FormModal.vue.vm
+++ b/coffee-codegen/src/main/resources/templates/vue/FormModal.vue.vm
--- a/coffee-codegen/src/main/resources/templates/vue/api.ts.vm
+++ b/coffee-codegen/src/main/resources/templates/vue/api.ts.vm
--- a/coffee-codegen/src/main/resources/templates/vue/data.ts.vm
+++ b/coffee-codegen/src/main/resources/templates/vue/data.ts.vm
--- a/coffee-codegen/src/main/resources/templates/vue/index.vue.vm
+++ b/coffee-codegen/src/main/resources/templates/vue/index.vue.vm
--- a/coffee-common/pom.xml
+++ b/coffee-common/pom.xml
@@ -3,13 +3,13 @@
 
				          xmlns="http://maven.apache.org/POM/4.0.0"
			
 
				          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
			
 
				     <parent>
			
 
				-        <artifactId>coffee-boot</artifactId>
			
 
				-        <groupId>com.coffee</groupId>
			
 
				+        <artifactId>nb-root</artifactId>
			
 
				+        <groupId>com.tuoren</groupId>
			
 
				         <version>1.0</version>
			
 
				     </parent>
			
 
				     <modelVersion>4.0.0</modelVersion>
			
 
				 
			
 
				-    <artifactId>coffee-common</artifactId>
			
 
				+    <artifactId>nb-common</artifactId>
			
 
				 
			
 
				     <dependencies>
			
 
				         <dependency>
			
--- a/coffee-common/src/main/java/com/coffee/common/Constants.java
+++ b/coffee-common/src/main/java/com/coffee/common/Constants.java
--- a/coffee-common/src/main/java/com/coffee/common/MenuConstants.java
+++ b/coffee-common/src/main/java/com/coffee/common/MenuConstants.java
--- a/coffee-common/src/main/java/com/coffee/common/annotation/DataScope.java
+++ b/coffee-common/src/main/java/com/coffee/common/annotation/DataScope.java
--- a/coffee-common/src/main/java/com/coffee/common/annotation/DataSource.java
+++ b/coffee-common/src/main/java/com/coffee/common/annotation/DataSource.java
--- a/coffee-common/src/main/java/com/coffee/common/annotation/ExcelDict.java
+++ b/coffee-common/src/main/java/com/coffee/common/annotation/ExcelDict.java
--- a/coffee-common/src/main/java/com/coffee/common/annotation/IgnoreToken.java
+++ b/coffee-common/src/main/java/com/coffee/common/annotation/IgnoreToken.java
--- a/coffee-common/src/main/java/com/coffee/common/annotation/Log.java
+++ b/coffee-common/src/main/java/com/coffee/common/annotation/Log.java
--- a/coffee-common/src/main/java/com/coffee/common/bo/DictModel.java
+++ b/coffee-common/src/main/java/com/coffee/common/bo/DictModel.java
--- a/coffee-common/src/main/java/com/coffee/common/bo/LoginUser.java
+++ b/coffee-common/src/main/java/com/coffee/common/bo/LoginUser.java
--- a/coffee-common/src/main/java/com/coffee/common/bo/SysRoleBO.java
+++ b/coffee-common/src/main/java/com/coffee/common/bo/SysRoleBO.java
--- a/coffee-common/src/main/java/com/coffee/common/bo/SysUserBO.java
+++ b/coffee-common/src/main/java/com/coffee/common/bo/SysUserBO.java
--- a/coffee-common/src/main/java/com/coffee/common/cache/CacheConfig.java
+++ b/coffee-common/src/main/java/com/coffee/common/cache/CacheConfig.java
--- a/coffee-common/src/main/java/com/coffee/common/cache/ClusterConfigStorage.java
+++ b/coffee-common/src/main/java/com/coffee/common/cache/ClusterConfigStorage.java
--- a/coffee-common/src/main/java/com/coffee/common/cache/ConfigStorage.java
+++ b/coffee-common/src/main/java/com/coffee/common/cache/ConfigStorage.java
--- a/coffee-common/src/main/java/com/coffee/common/cache/manager/ClusterConfigStorageManager.java
+++ b/coffee-common/src/main/java/com/coffee/common/cache/manager/ClusterConfigStorageManager.java
--- a/coffee-common/src/main/java/com/coffee/common/cache/manager/ConfigStorageManager.java
+++ b/coffee-common/src/main/java/com/coffee/common/cache/manager/ConfigStorageManager.java
--- a/coffee-common/src/main/java/com/coffee/common/cache/message/ClusterCache.java
+++ b/coffee-common/src/main/java/com/coffee/common/cache/message/ClusterCache.java
--- a/coffee-common/src/main/java/com/coffee/common/cache/message/RedisClusterCache.java
+++ b/coffee-common/src/main/java/com/coffee/common/cache/message/RedisClusterCache.java
--- a/coffee-common/src/main/java/com/coffee/common/cache/value/SimpleValue.java
+++ b/coffee-common/src/main/java/com/coffee/common/cache/value/SimpleValue.java
--- a/coffee-common/src/main/java/com/coffee/common/cache/value/Value.java
+++ b/coffee-common/src/main/java/com/coffee/common/cache/value/Value.java
--- a/coffee-common/src/main/java/com/coffee/common/config/AppConfig.java
+++ b/coffee-common/src/main/java/com/coffee/common/config/AppConfig.java
--- a/coffee-common/src/main/java/com/coffee/common/config/BooleanToIntegerSerializer.java
+++ b/coffee-common/src/main/java/com/coffee/common/config/BooleanToIntegerSerializer.java
--- a/coffee-common/src/main/java/com/coffee/common/config/CacheHttpServletRequestWrapper.java
+++ b/coffee-common/src/main/java/com/coffee/common/config/CacheHttpServletRequestWrapper.java
--- a/coffee-common/src/main/java/com/coffee/common/config/CachingContentFilter.java
+++ b/coffee-common/src/main/java/com/coffee/common/config/CachingContentFilter.java
--- a/coffee-common/src/main/java/com/coffee/common/config/CorsConfig.java
+++ b/coffee-common/src/main/java/com/coffee/common/config/CorsConfig.java
--- a/coffee-common/src/main/java/com/coffee/common/config/MinioConfig.java
+++ b/coffee-common/src/main/java/com/coffee/common/config/MinioConfig.java
--- a/coffee-common/src/main/java/com/coffee/common/config/mybatis/DateToBigIntHandler.java
+++ b/coffee-common/src/main/java/com/coffee/common/config/mybatis/DateToBigIntHandler.java
--- a/coffee-common/src/main/java/com/coffee/common/config/mybatis/GetNameInterface.java
+++ b/coffee-common/src/main/java/com/coffee/common/config/mybatis/GetNameInterface.java
--- a/coffee-common/src/main/java/com/coffee/common/config/mybatis/TenantNameHandler.java
+++ b/coffee-common/src/main/java/com/coffee/common/config/mybatis/TenantNameHandler.java
--- a/coffee-common/src/main/java/com/coffee/common/config/websocket/DefaultMessageListener.java
+++ b/coffee-common/src/main/java/com/coffee/common/config/websocket/DefaultMessageListener.java
--- a/coffee-common/src/main/java/com/coffee/common/config/websocket/DefaultRedisCallBack.java
+++ b/coffee-common/src/main/java/com/coffee/common/config/websocket/DefaultRedisCallBack.java
--- a/coffee-common/src/main/java/com/coffee/common/config/websocket/HospitalCodeCheck.java
+++ b/coffee-common/src/main/java/com/coffee/common/config/websocket/HospitalCodeCheck.java
--- a/coffee-common/src/main/java/com/coffee/common/config/websocket/MessageResponse.java
+++ b/coffee-common/src/main/java/com/coffee/common/config/websocket/MessageResponse.java
--- a/coffee-common/src/main/java/com/coffee/common/config/websocket/MessagingRequest.java
+++ b/coffee-common/src/main/java/com/coffee/common/config/websocket/MessagingRequest.java
--- a/coffee-common/src/main/java/com/coffee/common/config/websocket/TopicMessage.java
+++ b/coffee-common/src/main/java/com/coffee/common/config/websocket/TopicMessage.java
--- a/coffee-common/src/main/java/com/coffee/common/config/websocket/WebSocketConstant.java
+++ b/coffee-common/src/main/java/com/coffee/common/config/websocket/WebSocketConstant.java
--- a/coffee-common/src/main/java/com/coffee/common/config/websocket/WebSocketUtil.java
+++ b/coffee-common/src/main/java/com/coffee/common/config/websocket/WebSocketUtil.java
--- a/coffee-common/src/main/java/com/coffee/common/config/websocket/handler/Subscribe.java
+++ b/coffee-common/src/main/java/com/coffee/common/config/websocket/handler/Subscribe.java
--- a/coffee-common/src/main/java/com/coffee/common/config/websocket/handler/TopicWrapper.java
+++ b/coffee-common/src/main/java/com/coffee/common/config/websocket/handler/TopicWrapper.java
--- a/coffee-common/src/main/java/com/coffee/common/config/websocket/handler/WsHandler.java
+++ b/coffee-common/src/main/java/com/coffee/common/config/websocket/handler/WsHandler.java
--- a/coffee-common/src/main/java/com/coffee/common/convert/ExcelDictConverter.java
+++ b/coffee-common/src/main/java/com/coffee/common/convert/ExcelDictConverter.java
--- a/coffee-common/src/main/java/com/coffee/common/crud/BaseService.java
+++ b/coffee-common/src/main/java/com/coffee/common/crud/BaseService.java
--- a/coffee-common/src/main/java/com/coffee/common/crud/controller/BaseCrudController.java
+++ b/coffee-common/src/main/java/com/coffee/common/crud/controller/BaseCrudController.java
--- a/coffee-common/src/main/java/com/coffee/common/crud/controller/BaseCurdAuthController.java
+++ b/coffee-common/src/main/java/com/coffee/common/crud/controller/BaseCurdAuthController.java
--- a/coffee-common/src/main/java/com/coffee/common/crud/controller/BaseDeleteController.java
+++ b/coffee-common/src/main/java/com/coffee/common/crud/controller/BaseDeleteController.java
--- a/coffee-common/src/main/java/com/coffee/common/crud/controller/BaseQueryController.java
+++ b/coffee-common/src/main/java/com/coffee/common/crud/controller/BaseQueryController.java
--- a/coffee-common/src/main/java/com/coffee/common/crud/controller/BaseSaveController.java
+++ b/coffee-common/src/main/java/com/coffee/common/crud/controller/BaseSaveController.java
--- a/coffee-common/src/main/java/com/coffee/common/dto/LoginDTO.java
+++ b/coffee-common/src/main/java/com/coffee/common/dto/LoginDTO.java
--- a/coffee-common/src/main/java/com/coffee/common/entity/AbstractMsgId.java
+++ b/coffee-common/src/main/java/com/coffee/common/entity/AbstractMsgId.java
--- a/coffee-common/src/main/java/com/coffee/common/entity/Entity.java
+++ b/coffee-common/src/main/java/com/coffee/common/entity/Entity.java
--- a/coffee-common/src/main/java/com/coffee/common/entity/GenericEntity.java
+++ b/coffee-common/src/main/java/com/coffee/common/entity/GenericEntity.java
--- a/coffee-common/src/main/java/com/coffee/common/entity/GenericTreeEntity.java
+++ b/coffee-common/src/main/java/com/coffee/common/entity/GenericTreeEntity.java
--- a/coffee-common/src/main/java/com/coffee/common/entity/QueryParamEntity.java
+++ b/coffee-common/src/main/java/com/coffee/common/entity/QueryParamEntity.java
--- a/coffee-common/src/main/java/com/coffee/common/entity/RecordCreationEntity.java
+++ b/coffee-common/src/main/java/com/coffee/common/entity/RecordCreationEntity.java
--- a/coffee-common/src/main/java/com/coffee/common/entity/RecordModifierEntity.java
+++ b/coffee-common/src/main/java/com/coffee/common/entity/RecordModifierEntity.java
--- a/coffee-common/src/main/java/com/coffee/common/entity/TenantGenericEntity.java
+++ b/coffee-common/src/main/java/com/coffee/common/entity/TenantGenericEntity.java