Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haoban3.0
haoban-manage3.0
Commits
fcdf3eb5
Commit
fcdf3eb5
authored
Feb 10, 2020
by
陶光胜
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'developer' into 'master'
Developer See merge request
!1
parents
e4389f3c
7bc77e9e
Hide whitespace changes
Inline
Side-by-side
Showing
49 changed files
with
6 additions
and
6 deletions
+6
-6
app.properties
...manage-service/src/main/resources/META-INF/app.properties
+0
-1
pom.xml
haoban-manage3-api/pom.xml
+0
-0
TestDTO.java
.../src/main/java/com/gic/haoban/manage/api/dto/TestDTO.java
+0
-0
FirstUserConfigTypeEnum.java
.../gic/haoban/manage/api/enums/FirstUserConfigTypeEnum.java
+0
-0
TestApiService.java
...ava/com/gic/haoban/manage/api/service/TestApiService.java
+0
-0
pom.xml
haoban-manage3-service/pom.xml
+0
-0
TestMapper.java
.../com/gic/haoban/manage/service/dao/mapper/TestMapper.java
+0
-0
Test.java
.../main/java/com/gic/haoban/manage/service/entity/Test.java
+0
-0
TestService.java
...va/com/gic/haoban/manage/service/service/TestService.java
+0
-0
TestServiceImpl.java
...c/haoban/manage/service/service/impl/TestServiceImpl.java
+0
-0
TestApiServiceImpl.java
...n/manage/service/service/out/impl/TestApiServiceImpl.java
+0
-0
app.properties
...anage3-service/src/main/resources/META-INF/app.properties
+1
-0
applicationContext-conf.xml
...e3-service/src/main/resources/applicationContext-conf.xml
+0
-0
dubbo-haoban-manage-service.xml
...ervice/src/main/resources/dubbo-haoban-manage-service.xml
+0
-0
dubbo-project.properties
...nage3-service/src/main/resources/dubbo-project.properties
+0
-0
dubbo-setting-test.xml
...manage3-service/src/main/resources/dubbo-setting-test.xml
+0
-0
jdbc-haoban-manage-service.xml
...service/src/main/resources/jdbc-haoban-manage-service.xml
+2
-2
TestMapper.xml
...-manage3-service/src/main/resources/mapper/TestMapper.xml
+0
-0
pom.xml
haoban-manage3-web/pom.xml
+0
-0
WebBaseController.java
...m/gic/haoban/manage/web/controller/WebBaseController.java
+0
-0
TestController.java
...gic/haoban/manage/web/controller/test/TestController.java
+0
-0
HaoBanErrCode.java
...java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java
+0
-0
ControllerException.java
.../gic/haoban/manage/web/exception/ControllerException.java
+0
-0
GlobalExceptionHandler.java
...c/haoban/manage/web/exception/GlobalExceptionHandler.java
+0
-0
NoLoginException.java
...com/gic/haoban/manage/web/exception/NoLoginException.java
+0
-0
MyApplicationContextAware.java
...gic/haoban/manage/web/init/MyApplicationContextAware.java
+0
-0
ResponseInterceptor.java
...ic/haoban/manage/web/interceptor/ResponseInterceptor.java
+0
-0
TestLoginInterceptor.java
...c/haoban/manage/web/interceptor/TestLoginInterceptor.java
+0
-0
WebInterceptor.java
...com/gic/haoban/manage/web/interceptor/WebInterceptor.java
+0
-0
TestQo.java
...eb/src/main/java/com/gic/haoban/manage/web/qo/TestQo.java
+0
-0
MenuDetailResponse.java
...om/gic/haoban/manage/web/response/MenuDetailResponse.java
+0
-0
RoleDetailResponse.java
...om/gic/haoban/manage/web/response/RoleDetailResponse.java
+0
-0
WebLoginResponse.java
.../com/gic/haoban/manage/web/response/WebLoginResponse.java
+0
-0
IOUtils.java
...rc/main/java/com/gic/haoban/manage/web/utils/IOUtils.java
+0
-0
NationCodePhoneFormater.java
.../gic/haoban/manage/web/utils/NationCodePhoneFormater.java
+0
-0
TestVo.java
...eb/src/main/java/com/gic/haoban/manage/web/vo/TestVo.java
+0
-0
dubbo-project.properties
...n-manage3-web/src/main/resources/dubbo-project.properties
+0
-0
applicationContext-conf.xml
...3-web/src/main/webapp/WEB-INF/applicationContext-conf.xml
+0
-0
dubbo-haoban-manage-web.xml
...3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml
+0
-0
redis-session.xml
haoban-manage3-web/src/main/webapp/WEB-INF/redis-session.xml
+0
-0
spring-interceptor.xml
...anage3-web/src/main/webapp/WEB-INF/spring-interceptor.xml
+0
-0
spring-servlet.xml
...an-manage3-web/src/main/webapp/WEB-INF/spring-servlet.xml
+0
-0
web.xml
haoban-manage3-web/src/main/webapp/WEB-INF/web.xml
+0
-0
employeeTemplate.xls
...anage3-web/src/main/webapp/excel/zip/employeeTemplate.xls
+0
-0
storeTemplate.xls
...n-manage3-web/src/main/webapp/excel/zip/storeTemplate.xls
+0
-0
通讯录-行政架构导入模板.xls
haoban-manage3-web/src/main/webapp/excel/通讯录-行政架构导入模板.xls
+0
-0
通讯录-行政架构导入模板.xlsx
haoban-manage3-web/src/main/webapp/excel/通讯录-行政架构导入模板.xlsx
+0
-0
通讯录-门店架构导入模板.xlsx
haoban-manage3-web/src/main/webapp/excel/通讯录-门店架构导入模板.xlsx
+0
-0
pom.xml
pom.xml
+3
-3
No files found.
haoban-manage-service/src/main/resources/META-INF/app.properties
deleted
100644 → 0
View file @
e4389f3c
app.id
=
haoban
haoban-manage-api/pom.xml
→
haoban-manage
3
-api/pom.xml
View file @
fcdf3eb5
File moved
haoban-manage-api/src/main/java/com/gic/haoban/manage/api/dto/TestDTO.java
→
haoban-manage
3
-api/src/main/java/com/gic/haoban/manage/api/dto/TestDTO.java
View file @
fcdf3eb5
File moved
haoban-manage-api/src/main/java/com/gic/haoban/manage/api/enums/FirstUserConfigTypeEnum.java
→
haoban-manage
3
-api/src/main/java/com/gic/haoban/manage/api/enums/FirstUserConfigTypeEnum.java
View file @
fcdf3eb5
File moved
haoban-manage-api/src/main/java/com/gic/haoban/manage/api/service/TestApiService.java
→
haoban-manage
3
-api/src/main/java/com/gic/haoban/manage/api/service/TestApiService.java
View file @
fcdf3eb5
File moved
haoban-manage-service/pom.xml
→
haoban-manage
3
-service/pom.xml
View file @
fcdf3eb5
File moved
haoban-manage-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TestMapper.java
→
haoban-manage
3
-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TestMapper.java
View file @
fcdf3eb5
File moved
haoban-manage-service/src/main/java/com/gic/haoban/manage/service/entity/Test.java
→
haoban-manage
3
-service/src/main/java/com/gic/haoban/manage/service/entity/Test.java
View file @
fcdf3eb5
File moved
haoban-manage-service/src/main/java/com/gic/haoban/manage/service/service/TestService.java
→
haoban-manage
3
-service/src/main/java/com/gic/haoban/manage/service/service/TestService.java
View file @
fcdf3eb5
File moved
haoban-manage-service/src/main/java/com/gic/haoban/manage/service/service/impl/TestServiceImpl.java
→
haoban-manage
3
-service/src/main/java/com/gic/haoban/manage/service/service/impl/TestServiceImpl.java
View file @
fcdf3eb5
File moved
haoban-manage-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/TestApiServiceImpl.java
→
haoban-manage
3
-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/TestApiServiceImpl.java
View file @
fcdf3eb5
File moved
haoban-manage3-service/src/main/resources/META-INF/app.properties
0 → 100644
View file @
fcdf3eb5
app.id
=
work-weixin
haoban-manage-service/src/main/resources/applicationContext-conf.xml
→
haoban-manage
3
-service/src/main/resources/applicationContext-conf.xml
View file @
fcdf3eb5
File moved
haoban-manage-service/src/main/resources/dubbo-haoban-manage-service.xml
→
haoban-manage
3
-service/src/main/resources/dubbo-haoban-manage-service.xml
View file @
fcdf3eb5
File moved
haoban-manage-service/src/main/resources/dubbo-project.properties
→
haoban-manage
3
-service/src/main/resources/dubbo-project.properties
View file @
fcdf3eb5
File moved
haoban-manage-service/src/main/resources/dubbo-setting-test.xml
→
haoban-manage
3
-service/src/main/resources/dubbo-setting-test.xml
View file @
fcdf3eb5
File moved
haoban-manage-service/src/main/resources/jdbc-haoban-manage-service.xml
→
haoban-manage
3
-service/src/main/resources/jdbc-haoban-manage-service.xml
View file @
fcdf3eb5
...
...
@@ -22,8 +22,8 @@
<!--<property name="location" value="classpath:jdbc-haoban.properties" />-->
<!--</bean>-->
<
!--<import resource="classpath*:applicationContext-db-only.xml"/>--
>
<
import
resource=
"classpath*:applicationContext-db-only-with-emoji.xml"
/
>
<
import
resource=
"classpath*:applicationContext-db-only.xml"
/
>
<
!--<import resource="classpath*:applicationContext-db-only-with-emoji.xml"/>--
>
<bean
class=
"com.gic.haoban.common.init.HaobanSqlSessionFactoryBean"
id=
"sqlSessionFactory"
>
<property
name=
"dataSource"
ref=
"dataSource"
/>
<property
name=
"typeAliasesPackage"
value=
"com.gic.haoban.**.entity,com.gic.haoban.*.entity"
/>
...
...
haoban-manage-service/src/main/resources/mapper/TestMapper.xml
→
haoban-manage
3
-service/src/main/resources/mapper/TestMapper.xml
View file @
fcdf3eb5
File moved
haoban-manage-web/pom.xml
→
haoban-manage
3
-web/pom.xml
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/java/com/gic/haoban/manage/web/controller/WebBaseController.java
→
haoban-manage
3
-web/src/main/java/com/gic/haoban/manage/web/controller/WebBaseController.java
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/java/com/gic/haoban/manage/web/controller/test/TestController.java
→
haoban-manage
3
-web/src/main/java/com/gic/haoban/manage/web/controller/test/TestController.java
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java
→
haoban-manage
3
-web/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/java/com/gic/haoban/manage/web/exception/ControllerException.java
→
haoban-manage
3
-web/src/main/java/com/gic/haoban/manage/web/exception/ControllerException.java
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/java/com/gic/haoban/manage/web/exception/GlobalExceptionHandler.java
→
haoban-manage
3
-web/src/main/java/com/gic/haoban/manage/web/exception/GlobalExceptionHandler.java
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/java/com/gic/haoban/manage/web/exception/NoLoginException.java
→
haoban-manage
3
-web/src/main/java/com/gic/haoban/manage/web/exception/NoLoginException.java
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/java/com/gic/haoban/manage/web/init/MyApplicationContextAware.java
→
haoban-manage
3
-web/src/main/java/com/gic/haoban/manage/web/init/MyApplicationContextAware.java
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/java/com/gic/haoban/manage/web/interceptor/ResponseInterceptor.java
→
haoban-manage
3
-web/src/main/java/com/gic/haoban/manage/web/interceptor/ResponseInterceptor.java
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/java/com/gic/haoban/manage/web/interceptor/TestLoginInterceptor.java
→
haoban-manage
3
-web/src/main/java/com/gic/haoban/manage/web/interceptor/TestLoginInterceptor.java
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/java/com/gic/haoban/manage/web/interceptor/WebInterceptor.java
→
haoban-manage
3
-web/src/main/java/com/gic/haoban/manage/web/interceptor/WebInterceptor.java
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/java/com/gic/haoban/manage/web/qo/TestQo.java
→
haoban-manage
3
-web/src/main/java/com/gic/haoban/manage/web/qo/TestQo.java
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/java/com/gic/haoban/manage/web/response/MenuDetailResponse.java
→
haoban-manage
3
-web/src/main/java/com/gic/haoban/manage/web/response/MenuDetailResponse.java
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/java/com/gic/haoban/manage/web/response/RoleDetailResponse.java
→
haoban-manage
3
-web/src/main/java/com/gic/haoban/manage/web/response/RoleDetailResponse.java
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/java/com/gic/haoban/manage/web/response/WebLoginResponse.java
→
haoban-manage
3
-web/src/main/java/com/gic/haoban/manage/web/response/WebLoginResponse.java
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/java/com/gic/haoban/manage/web/utils/IOUtils.java
→
haoban-manage
3
-web/src/main/java/com/gic/haoban/manage/web/utils/IOUtils.java
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/java/com/gic/haoban/manage/web/utils/NationCodePhoneFormater.java
→
haoban-manage
3
-web/src/main/java/com/gic/haoban/manage/web/utils/NationCodePhoneFormater.java
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/java/com/gic/haoban/manage/web/vo/TestVo.java
→
haoban-manage
3
-web/src/main/java/com/gic/haoban/manage/web/vo/TestVo.java
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/resources/dubbo-project.properties
→
haoban-manage
3
-web/src/main/resources/dubbo-project.properties
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/webapp/WEB-INF/applicationContext-conf.xml
→
haoban-manage
3
-web/src/main/webapp/WEB-INF/applicationContext-conf.xml
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml
→
haoban-manage
3
-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/webapp/WEB-INF/redis-session.xml
→
haoban-manage
3
-web/src/main/webapp/WEB-INF/redis-session.xml
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/webapp/WEB-INF/spring-interceptor.xml
→
haoban-manage
3
-web/src/main/webapp/WEB-INF/spring-interceptor.xml
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/webapp/WEB-INF/spring-servlet.xml
→
haoban-manage
3
-web/src/main/webapp/WEB-INF/spring-servlet.xml
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/webapp/WEB-INF/web.xml
→
haoban-manage
3
-web/src/main/webapp/WEB-INF/web.xml
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/webapp/excel/zip/employeeTemplate.xls
→
haoban-manage
3
-web/src/main/webapp/excel/zip/employeeTemplate.xls
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/webapp/excel/zip/storeTemplate.xls
→
haoban-manage
3
-web/src/main/webapp/excel/zip/storeTemplate.xls
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/webapp/excel/通讯录-行政架构导入模板.xls
→
haoban-manage
3
-web/src/main/webapp/excel/通讯录-行政架构导入模板.xls
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/webapp/excel/通讯录-行政架构导入模板.xlsx
→
haoban-manage
3
-web/src/main/webapp/excel/通讯录-行政架构导入模板.xlsx
View file @
fcdf3eb5
File moved
haoban-manage-web/src/main/webapp/excel/通讯录-门店架构导入模板.xlsx
→
haoban-manage
3
-web/src/main/webapp/excel/通讯录-门店架构导入模板.xlsx
View file @
fcdf3eb5
File moved
pom.xml
View file @
fcdf3eb5
...
...
@@ -9,9 +9,9 @@
<packaging>
pom
</packaging>
<version>
3.0-SNAPSHOT
</version>
<modules>
<module>
haoban-manage-api
</module>
<module>
haoban-manage-service
</module>
<module>
haoban-manage-web
</module>
<module>
haoban-manage
3
-api
</module>
<module>
haoban-manage
3
-service
</module>
<module>
haoban-manage
3
-web
</module>
</modules>
<distributionManagement>
<repository>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment