xioayue
/
bcjava
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

代码更新

master
453530270@qq.com 2 years ago
parent
7e3b5b7170
commit
d3de76be66
8 changed files with 415 additions and 452 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 500
      .idea/workspace.xml
  2. 5
      bcapi/src/main/java/bc/mm/mis/api/configure/DataSourceConfig.java
  3. 5
      bcapi/src/main/resources/application.properties
  4. 17
      bccore/src/main/java/bc/mm/core/bean/Country.java
  5. 308
      bccore/src/main/java/bc/mm/core/bean/Users.java
  6. 5
      bccore/src/main/java/bc/mm/core/dao/CountryDao.java
  7. 21
      bccore/src/main/java/bc/mm/core/dao/CrudDao.java
  8. 6
      bccore/src/main/resources/application.properties

500
.idea/workspace.xml
View File

@ -7,8 +7,8 @@
<change beforePath="$PROJECT_DIR$/bcapi/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/bcapi/src/main/resources/application.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/bean/Country.java" beforeDir="false" afterPath="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/bean/Country.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/bean/Users.java" beforeDir="false" afterPath="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/bean/Users.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/dao/CountryDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/dao/CountryDao.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bccore/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/bccore/src/main/resources/application.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/target/" />
@ -32,133 +32,17 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/bccore/src/main/resources/application.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="11" column="77" selection-start-line="11" selection-start-column="77" selection-end-line="11" selection-end-column="77" />
<state relative-caret-position="138">
<caret line="6" selection-start-line="6" selection-end-line="8" selection-end-column="65" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/bcapi/src/main/java/bc/mm/mis/api/configure/DataSourceConfig.java">
<entry file="file://$PROJECT_DIR$/bcapi/src/main/resources/application.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="196">
<caret line="11" column="6" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/dao/CountryDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="9" column="10" selection-start-line="9" selection-start-column="1" selection-end-line="9" selection-end-column="10" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/bean/Country.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="11" selection-start-line="11" selection-end-line="11" />
<folding>
<element signature="e#762#763#0" expanded="true" />
<element signature="e#796#797#0" expanded="true" />
<element signature="e#850#851#0" expanded="true" />
<element signature="e#896#897#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/bean/Users.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2869#2870#0" expanded="true" />
<element signature="e#2896#2897#0" expanded="true" />
<element signature="e#3793#3794#0" expanded="true" />
<element signature="e#3821#3822#0" expanded="true" />
<element signature="e#6177#6178#0" expanded="true" />
<element signature="e#6208#6209#0" expanded="true" />
<element signature="e#6257#6258#0" expanded="true" />
<element signature="e#6297#6298#0" expanded="true" />
<element signature="e#6334#6335#0" expanded="true" />
<element signature="e#6366#6367#0" expanded="true" />
<element signature="e#6417#6418#0" expanded="true" />
<element signature="e#6459#6460#0" expanded="true" />
<element signature="e#6500#6501#0" expanded="true" />
<element signature="e#6536#6537#0" expanded="true" />
<element signature="e#6595#6596#0" expanded="true" />
<element signature="e#6645#6646#0" expanded="true" />
<element signature="e#6682#6683#0" expanded="true" />
<element signature="e#6715#6716#0" expanded="true" />
<element signature="e#6767#6768#0" expanded="true" />
<element signature="e#6811#6812#0" expanded="true" />
<element signature="e#6845#6846#0" expanded="true" />
<element signature="e#6874#6875#0" expanded="true" />
<element signature="e#6919#6920#0" expanded="true" />
<element signature="e#6955#6956#0" expanded="true" />
<element signature="e#6995#6996#0" expanded="true" />
<element signature="e#7030#7031#0" expanded="true" />
<element signature="e#7087#7088#0" expanded="true" />
<element signature="e#7135#7136#0" expanded="true" />
<element signature="e#7175#7176#0" expanded="true" />
<element signature="e#7210#7211#0" expanded="true" />
<element signature="e#7267#7268#0" expanded="true" />
<element signature="e#7315#7316#0" expanded="true" />
<element signature="e#7359#7360#0" expanded="true" />
<element signature="e#7398#7399#0" expanded="true" />
<element signature="e#7463#7464#0" expanded="true" />
<element signature="e#7519#7520#0" expanded="true" />
<element signature="e#7552#7553#0" expanded="true" />
<element signature="e#7581#7582#0" expanded="true" />
<element signature="e#7625#7626#0" expanded="true" />
<element signature="e#7661#7662#0" expanded="true" />
<element signature="e#7701#7702#0" expanded="true" />
<element signature="e#7739#7740#0" expanded="true" />
<element signature="e#7799#7800#0" expanded="true" />
<element signature="e#7853#7854#0" expanded="true" />
<element signature="e#7893#7894#0" expanded="true" />
<element signature="e#7929#7930#0" expanded="true" />
<element signature="e#7987#7988#0" expanded="true" />
<element signature="e#8037#8038#0" expanded="true" />
<element signature="e#8072#8073#0" expanded="true" />
<element signature="e#8105#8106#0" expanded="true" />
<element signature="e#8155#8156#0" expanded="true" />
<element signature="e#8199#8200#0" expanded="true" />
<element signature="e#8234#8235#0" expanded="true" />
<element signature="e#8267#8268#0" expanded="true" />
<element signature="e#8317#8318#0" expanded="true" />
<element signature="e#8361#8362#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/bccore/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="13" column="46" selection-start-line="13" selection-start-column="46" selection-end-line="13" selection-end-column="46" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="455">
<caret line="63" column="21" selection-start-line="63" selection-start-column="21" selection-end-line="63" selection-end-column="21" />
<state relative-caret-position="264">
<caret line="12" column="5" selection-start-line="12" selection-start-column="5" selection-end-line="12" selection-end-column="5" />
</state>
</provider>
</entry>
@ -202,19 +86,19 @@
<option value="$PROJECT_DIR$/bctask/src/main/resources/application.properties" />
<option value="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/dao/CrudDao.java" />
<option value="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/service/ICountryService.java" />
<option value="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/dao/CountryDao.java" />
<option value="$PROJECT_DIR$/bcapi/src/main/java/bc/mm/mis/api/controller/v1/CountryController.java" />
<option value="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/service/impl/CountryServiceImpl.java" />
<option value="$PROJECT_DIR$/bcapi/pom.xml" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/bcapi/src/main/resources/application.properties" />
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/bccore/src/test/java/bc/mm/core/dao/CountryDaoTest.java" />
<option value="$PROJECT_DIR$/bccore/pom.xml" />
<option value="$PROJECT_DIR$/bccore/src/main/resources/application.properties" />
<option value="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/bean/Users.java" />
<option value="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/bean/Country.java" />
<option value="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/dao/CountryDao.java" />
<option value="$PROJECT_DIR$/bcapi/src/main/java/bc/mm/mis/api/configure/DataSourceConfig.java" />
<option value="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/bean/Country.java" />
<option value="$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/bean/Users.java" />
<option value="$PROJECT_DIR$/bccore/src/main/resources/application.properties" />
<option value="$PROJECT_DIR$/bcapi/src/main/resources/application.properties" />
</list>
</option>
</component>
@ -280,89 +164,25 @@
<item name="bcapi" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
<item name="bcjava" type="462c0819:PsiDirectoryNode" />
<item name="bcapi" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="api" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
<item name="bcjava" type="462c0819:PsiDirectoryNode" />
<item name="bcapi" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="api" type="462c0819:PsiDirectoryNode" />
<item name="configure" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
<item name="bcjava" type="462c0819:PsiDirectoryNode" />
<item name="bccore" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
<item name="bcjava" type="462c0819:PsiDirectoryNode" />
<item name="bccore" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
<item name="bcjava" type="462c0819:PsiDirectoryNode" />
<item name="bccore" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
<item name="bcjava" type="462c0819:PsiDirectoryNode" />
<item name="bccore" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
<item name="bcjava" type="462c0819:PsiDirectoryNode" />
<item name="bccore" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="core" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
<item name="bcjava" type="462c0819:PsiDirectoryNode" />
<item name="bccore" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="core" type="462c0819:PsiDirectoryNode" />
<item name="bean" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
<item name="bcjava" type="462c0819:PsiDirectoryNode" />
<item name="bccore" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="core" type="462c0819:PsiDirectoryNode" />
<item name="dao" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
<item name="bcjava" type="462c0819:PsiDirectoryNode" />
<item name="bccore" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
@ -430,6 +250,7 @@
</RuleState>
</list>
</option>
<option name="contentProportion" value="0.18939394" />
</component>
<component name="RunManager" selected="Spring Boot.BcApiApplication">
<configuration name="CountryDaoTest.findAll" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
@ -493,7 +314,7 @@
<option name="presentableId" value="Default" />
<updated>1709705326078</updated>
<workItem from="1709705327787" duration="24157000" />
<workItem from="1709883033427" duration="2384000" />
<workItem from="1709883033427" duration="6506000" />
</task>
<task id="LOCAL-00001" summary="补充springboot 结构">
<created>1709706040716</created>
@ -607,7 +428,14 @@
<option name="project" value="LOCAL" />
<updated>1709870318383</updated>
</task>
<option name="localTasksCounter" value="17" />
<task id="LOCAL-00017" summary="代码更新">
<created>1709885679049</created>
<option name="number" value="00017" />
<option name="presentableId" value="LOCAL-00017" />
<option name="project" value="LOCAL" />
<updated>1709885679049</updated>
</task>
<option name="localTasksCounter" value="18" />
<servers />
</component>
<component name="TestHistory">
@ -616,12 +444,12 @@
</history-entry>
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="26541000" />
<option name="totallyTimeSpent" value="30663000" />
</component>
<component name="ToolWindowManager">
<frame x="1912" y="-7" width="1936" height="1056" extended-state="6" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25266525" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25266525" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Designer" order="2" />
<window_info id="Image Layers" order="3" />
@ -644,7 +472,7 @@
<window_info anchor="bottom" id="Java Enterprise" order="12" weight="0.329718" />
<window_info anchor="bottom" id="Database Changes" order="13" />
<window_info anchor="bottom" id="Version Control" order="14" weight="0.329718" />
<window_info active="true" anchor="bottom" id="Run Dashboard" order="15" visible="true" weight="0.329718" />
<window_info anchor="bottom" id="Run Dashboard" order="15" visible="true" weight="0.329718" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@ -675,7 +503,8 @@
<MESSAGE value="调整依赖关系" />
<MESSAGE value="调整代码" />
<MESSAGE value="启动配置" />
<option name="LAST_COMMIT_MESSAGE" value="启动配置" />
<MESSAGE value="代码更新" />
<option name="LAST_COMMIT_MESSAGE" value="代码更新" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/bcws/pom.xml">
@ -854,13 +683,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bcapi/src/main/resources/application.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="11" column="60" selection-start-line="11" selection-start-column="60" selection-end-line="11" selection-end-column="60" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.7.15/spring-boot-autoconfigure-2.7.15.jar!/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="197">
@ -870,7 +692,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="455">
<state relative-caret-position="498">
<caret line="63" column="21" selection-start-line="63" selection-start-column="21" selection-end-line="63" selection-end-column="21" />
</state>
</provider>
@ -894,107 +716,223 @@
</entry>
<entry file="file://$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/dao/CountryDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="9" column="10" selection-start-line="9" selection-start-column="1" selection-end-line="9" selection-end-column="10" />
<state relative-caret-position="220">
<caret line="10" column="49" selection-start-line="10" selection-start-column="36" selection-end-line="10" selection-end-column="49" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.3.29/spring-beans-5.3.29.jar!/org/springframework/beans/factory/support/ConstructorResolver.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="197">
<caret line="520" selection-start-line="520" selection-end-line="520" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/bean/Users.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
<state relative-caret-position="304">
<caret line="79" column="32" lean-forward="true" selection-start-line="79" selection-start-column="32" selection-end-line="79" selection-end-column="32" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2869#2870#0" expanded="true" />
<element signature="e#2896#2897#0" expanded="true" />
<element signature="e#3793#3794#0" expanded="true" />
<element signature="e#3821#3822#0" expanded="true" />
<element signature="e#6177#6178#0" expanded="true" />
<element signature="e#6208#6209#0" expanded="true" />
<element signature="e#6257#6258#0" expanded="true" />
<element signature="e#6297#6298#0" expanded="true" />
<element signature="e#6334#6335#0" expanded="true" />
<element signature="e#6366#6367#0" expanded="true" />
<element signature="e#6417#6418#0" expanded="true" />
<element signature="e#6459#6460#0" expanded="true" />
<element signature="e#6500#6501#0" expanded="true" />
<element signature="e#6536#6537#0" expanded="true" />
<element signature="e#6595#6596#0" expanded="true" />
<element signature="e#6645#6646#0" expanded="true" />
<element signature="e#6682#6683#0" expanded="true" />
<element signature="e#6715#6716#0" expanded="true" />
<element signature="e#2786#2787#0" expanded="true" />
<element signature="e#2815#2816#0" expanded="true" />
<element signature="e#2857#2858#0" expanded="true" />
<element signature="e#2893#2894#0" expanded="true" />
<element signature="e#2920#2921#0" expanded="true" />
<element signature="e#2945#2946#0" expanded="true" />
<element signature="e#2979#2980#0" expanded="true" />
<element signature="e#3007#3008#0" expanded="true" />
<element signature="e#3038#3039#0" expanded="true" />
<element signature="e#3065#3066#0" expanded="true" />
<element signature="e#3105#3106#0" expanded="true" />
<element signature="e#3137#3138#0" expanded="true" />
<element signature="e#3171#3172#0" expanded="true" />
<element signature="e#3201#3202#0" expanded="true" />
<element signature="e#3247#3248#0" expanded="true" />
<element signature="e#3285#3286#0" expanded="true" />
<element signature="e#3323#3324#0" expanded="true" />
<element signature="e#3356#3357#0" expanded="true" />
<element signature="e#3409#3410#0" expanded="true" />
<element signature="e#3453#3454#0" expanded="true" />
<element signature="e#3488#3489#0" expanded="true" />
<element signature="e#3519#3520#0" expanded="true" />
<element signature="e#3567#3568#0" expanded="true" />
<element signature="e#3607#3608#0" expanded="true" />
<element signature="e#3643#3644#0" expanded="true" />
<element signature="e#3674#3675#0" expanded="true" />
<element signature="e#3723#3724#0" expanded="true" />
<element signature="e#3763#3764#0" expanded="true" />
<element signature="e#3791#3792#0" expanded="true" />
<element signature="e#3817#3818#0" expanded="true" />
<element signature="e#3853#3854#0" expanded="true" />
<element signature="e#3883#3884#0" expanded="true" />
<element signature="e#3915#3916#0" expanded="true" />
<element signature="e#3942#3943#0" expanded="true" />
<element signature="e#3983#3984#0" expanded="true" />
<element signature="e#4015#4016#0" expanded="true" />
<element signature="e#4046#4047#0" expanded="true" />
<element signature="e#4073#4074#0" expanded="true" />
<element signature="e#4113#4114#0" expanded="true" />
<element signature="e#4145#4146#0" expanded="true" />
<element signature="e#4183#4184#0" expanded="true" />
<element signature="e#4216#4217#0" expanded="true" />
<element signature="e#4269#4270#0" expanded="true" />
<element signature="e#4313#4314#0" expanded="true" />
<element signature="e#4351#4352#0" expanded="true" />
<element signature="e#4385#4386#0" expanded="true" />
<element signature="e#4439#4440#0" expanded="true" />
<element signature="e#4485#4486#0" expanded="true" />
<element signature="e#4517#4518#0" expanded="true" />
<element signature="e#4545#4546#0" expanded="true" />
<element signature="e#4587#4588#0" expanded="true" />
<element signature="e#4621#4622#0" expanded="true" />
<element signature="e#4660#4661#0" expanded="true" />
<element signature="e#4694#4695#0" expanded="true" />
<element signature="e#4749#4750#0" expanded="true" />
<element signature="e#4795#4796#0" expanded="true" />
<element signature="e#4827#4828#0" expanded="true" />
<element signature="e#4855#4856#0" expanded="true" />
<element signature="e#4897#4898#0" expanded="true" />
<element signature="e#4931#4932#0" expanded="true" />
<element signature="e#4970#4971#0" expanded="true" />
<element signature="e#5004#5005#0" expanded="true" />
<element signature="e#5059#5060#0" expanded="true" />
<element signature="e#5105#5106#0" expanded="true" />
<element signature="e#5138#5139#0" expanded="true" />
<element signature="e#5167#5168#0" expanded="true" />
<element signature="e#5211#5212#0" expanded="true" />
<element signature="e#5247#5248#0" expanded="true" />
<element signature="e#5285#5286#0" expanded="true" />
<element signature="e#5319#5320#0" expanded="true" />
<element signature="e#5373#5374#0" expanded="true" />
<element signature="e#5419#5420#0" expanded="true" />
<element signature="e#5459#5460#0" expanded="true" />
<element signature="e#5494#5495#0" expanded="true" />
<element signature="e#5551#5552#0" expanded="true" />
<element signature="e#5599#5600#0" expanded="true" />
<element signature="e#5639#5640#0" expanded="true" />
<element signature="e#5674#5675#0" expanded="true" />
<element signature="e#5731#5732#0" expanded="true" />
<element signature="e#5779#5780#0" expanded="true" />
<element signature="e#5814#5815#0" expanded="true" />
<element signature="e#5845#5846#0" expanded="true" />
<element signature="e#5893#5894#0" expanded="true" />
<element signature="e#5933#5934#0" expanded="true" />
<element signature="e#5967#5968#0" expanded="true" />
<element signature="e#5997#5998#0" expanded="true" />
<element signature="e#6043#6044#0" expanded="true" />
<element signature="e#6081#6082#0" expanded="true" />
<element signature="e#6118#6119#0" expanded="true" />
<element signature="e#6151#6152#0" expanded="true" />
<element signature="e#6203#6204#0" expanded="true" />
<element signature="e#6247#6248#0" expanded="true" />
<element signature="e#6286#6287#0" expanded="true" />
<element signature="e#6321#6322#0" expanded="true" />
<element signature="e#6377#6378#0" expanded="true" />
<element signature="e#6425#6426#0" expanded="true" />
<element signature="e#6462#6463#0" expanded="true" />
<element signature="e#6494#6495#0" expanded="true" />
<element signature="e#6545#6546#0" expanded="true" />
<element signature="e#6587#6588#0" expanded="true" />
<element signature="e#6627#6628#0" expanded="true" />
<element signature="e#6662#6663#0" expanded="true" />
<element signature="e#6719#6720#0" expanded="true" />
<element signature="e#6767#6768#0" expanded="true" />
<element signature="e#6811#6812#0" expanded="true" />
<element signature="e#6845#6846#0" expanded="true" />
<element signature="e#6874#6875#0" expanded="true" />
<element signature="e#6919#6920#0" expanded="true" />
<element signature="e#6955#6956#0" expanded="true" />
<element signature="e#6995#6996#0" expanded="true" />
<element signature="e#7030#7031#0" expanded="true" />
<element signature="e#7087#7088#0" expanded="true" />
<element signature="e#7135#7136#0" expanded="true" />
<element signature="e#7175#7176#0" expanded="true" />
<element signature="e#7210#7211#0" expanded="true" />
<element signature="e#7267#7268#0" expanded="true" />
<element signature="e#7315#7316#0" expanded="true" />
<element signature="e#7359#7360#0" expanded="true" />
<element signature="e#7398#7399#0" expanded="true" />
<element signature="e#7463#7464#0" expanded="true" />
<element signature="e#7519#7520#0" expanded="true" />
<element signature="e#7552#7553#0" expanded="true" />
<element signature="e#7581#7582#0" expanded="true" />
<element signature="e#7625#7626#0" expanded="true" />
<element signature="e#7661#7662#0" expanded="true" />
<element signature="e#7701#7702#0" expanded="true" />
<element signature="e#7739#7740#0" expanded="true" />
<element signature="e#7799#7800#0" expanded="true" />
<element signature="e#7853#7854#0" expanded="true" />
<element signature="e#7893#7894#0" expanded="true" />
<element signature="e#7929#7930#0" expanded="true" />
<element signature="e#7987#7988#0" expanded="true" />
<element signature="e#8037#8038#0" expanded="true" />
<element signature="e#8072#8073#0" expanded="true" />
<element signature="e#8105#8106#0" expanded="true" />
<element signature="e#8155#8156#0" expanded="true" />
<element signature="e#8199#8200#0" expanded="true" />
<element signature="e#8234#8235#0" expanded="true" />
<element signature="e#8267#8268#0" expanded="true" />
<element signature="e#8317#8318#0" expanded="true" />
<element signature="e#8361#8362#0" expanded="true" />
<element signature="e#6803#6804#0" expanded="true" />
<element signature="e#6834#6835#0" expanded="true" />
<element signature="e#6883#6884#0" expanded="true" />
<element signature="e#6923#6924#0" expanded="true" />
<element signature="e#6958#6959#0" expanded="true" />
<element signature="e#6988#6989#0" expanded="true" />
<element signature="e#7035#7036#0" expanded="true" />
<element signature="e#7073#7074#0" expanded="true" />
<element signature="e#7114#7115#0" expanded="true" />
<element signature="e#7150#7151#0" expanded="true" />
<element signature="e#7209#7210#0" expanded="true" />
<element signature="e#7259#7260#0" expanded="true" />
<element signature="e#7295#7296#0" expanded="true" />
<element signature="e#7326#7327#0" expanded="true" />
<element signature="e#7375#7376#0" expanded="true" />
<element signature="e#7415#7416#0" expanded="true" />
<element signature="e#7455#7456#0" expanded="true" />
<element signature="e#7490#7491#0" expanded="true" />
<element signature="e#7547#7548#0" expanded="true" />
<element signature="e#7595#7596#0" expanded="true" />
<element signature="e#7631#7632#0" expanded="true" />
<element signature="e#7663#7664#0" expanded="true" />
<element signature="e#7713#7714#0" expanded="true" />
<element signature="e#7755#7756#0" expanded="true" />
<element signature="e#7789#7790#0" expanded="true" />
<element signature="e#7818#7819#0" expanded="true" />
<element signature="e#7863#7864#0" expanded="true" />
<element signature="e#7899#7900#0" expanded="true" />
<element signature="e#7938#7939#0" expanded="true" />
<element signature="e#7972#7973#0" expanded="true" />
<element signature="e#8027#8028#0" expanded="true" />
<element signature="e#8073#8074#0" expanded="true" />
<element signature="e#8112#8113#0" expanded="true" />
<element signature="e#8146#8147#0" expanded="true" />
<element signature="e#8201#8202#0" expanded="true" />
<element signature="e#8247#8248#0" expanded="true" />
<element signature="e#8290#8291#0" expanded="true" />
<element signature="e#8328#8329#0" expanded="true" />
<element signature="e#8391#8392#0" expanded="true" />
<element signature="e#8445#8446#0" expanded="true" />
<element signature="e#8477#8478#0" expanded="true" />
<element signature="e#8505#8506#0" expanded="true" />
<element signature="e#8547#8548#0" expanded="true" />
<element signature="e#8581#8582#0" expanded="true" />
<element signature="e#8619#8620#0" expanded="true" />
<element signature="e#8655#8656#0" expanded="true" />
<element signature="e#8711#8712#0" expanded="true" />
<element signature="e#8761#8762#0" expanded="true" />
<element signature="e#8799#8800#0" expanded="true" />
<element signature="e#8833#8834#0" expanded="true" />
<element signature="e#8887#8888#0" expanded="true" />
<element signature="e#8933#8934#0" expanded="true" />
<element signature="e#8967#8968#0" expanded="true" />
<element signature="e#8999#9000#0" expanded="true" />
<element signature="e#9047#9048#0" expanded="true" />
<element signature="e#9089#9090#0" expanded="true" />
<element signature="e#9123#9124#0" expanded="true" />
<element signature="e#9155#9156#0" expanded="true" />
<element signature="e#9203#9204#0" expanded="true" />
<element signature="e#9245#9246#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bccore/src/main/java/bc/mm/core/bean/Country.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="11" selection-start-line="11" selection-end-line="11" />
<state relative-caret-position="264">
<caret line="15" selection-start-line="15" selection-end-line="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bcapi/src/main/java/bc/mm/mis/api/configure/DataSourceConfig.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="372">
<caret line="25" column="35" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
<folding>
<element signature="e#762#763#0" expanded="true" />
<element signature="e#796#797#0" expanded="true" />
<element signature="e#850#851#0" expanded="true" />
<element signature="e#896#897#0" expanded="true" />
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bccore/src/main/resources/application.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="11" column="77" selection-start-line="11" selection-start-column="77" selection-end-line="11" selection-end-column="77" />
<state relative-caret-position="138">
<caret line="6" selection-start-line="6" selection-end-line="8" selection-end-column="65" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bcapi/src/main/java/bc/mm/mis/api/configure/DataSourceConfig.java">
<entry file="file://$PROJECT_DIR$/bcapi/src/main/resources/application.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="196">
<caret line="11" column="6" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="264">
<caret line="12" column="5" selection-start-line="12" selection-start-column="5" selection-end-line="12" selection-end-column="5" />
</state>
</provider>
</entry>
@ -1049,7 +987,7 @@
</state>
<state key="ModuleStructureConfigurable.UI">
<settings>
<last-edited>Web|bccore</last-edited>
<last-edited>bccore</last-edited>
<splitter-proportions>
<option name="proportions">
<list>

5
bcapi/src/main/java/bc/mm/mis/api/configure/DataSourceConfig.java
View File

@ -2,6 +2,8 @@ package bc.mm.mis.api.configure;
import com.zaxxer.hikari.HikariDataSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
@ -12,6 +14,7 @@ import javax.sql.DataSource;
@Primary
@Configuration
public class DataSourceConfig {
private static final Log log = LogFactory.getLog(DataSourceConfig.class);
@Bean
public DataSource dataSource(Environment env){
HikariDataSource ds = new HikariDataSource();
@ -19,6 +22,8 @@ public class DataSourceConfig {
ds.setUsername(env.getProperty("spring.datasource.username"));
ds.setPassword(env.getProperty("spring.datasource.password"));
ds.setDriverClassName(env.getProperty("spring.datasource.driver-class-name"));
//
log.info("datasource init!!");
return ds;
}
}

5
bcapi/src/main/resources/application.properties
View File

@ -9,4 +9,7 @@ spring.datasource.url=jdbc:mysql://localhost:3306/bcdb?useUnicode=true&character
# /szwhtrans?&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
spring.datasource.username=root
spring.datasource.password=root
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
# jpa
spring.jpa.show-sql=true
spring.jpa.database-platform=org.hibernate.dialect.MySQL5Dialect

17
bccore/src/main/java/bc/mm/core/bean/Country.java
View File

@ -3,6 +3,7 @@ package bc.mm.core.bean;
import javax.persistence.*;
@Entity
@Table(name = "country")
public class Country {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@ -12,8 +13,11 @@ public class Country {
@Column(name = "country_code")
private String countryCode;
private Integer order;
private String en_name;
@Column(name = "en_name")
private String enName;
public Integer getId() {
return id;
@ -55,11 +59,14 @@ public class Country {
this.order = order;
}
public String getEn_name() {
return en_name;
public String getEnName() {
return enName;
}
public void setEnName(String enName) {
this.enName = enName;
}
public void setEn_name(String en_name) {
this.en_name = en_name;
public Country() {
}
}

308
bccore/src/main/java/bc/mm/core/bean/Users.java
View File

@ -1,61 +1,93 @@
package bc.mm.core.bean;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.util.Date;
/**
* user bean
*/
@Entity
@Table(name = "users")
public class Users {
private Long user_id;
@Id
@Column(name = "user_id")
private Long userId;
private Long id; //for agent
private String name; // angent name
private String account; // major account
private Integer accoutn_type; // 1:phone 2:email
@Column(name = "account_type")
private Integer accountTpe; // 1:phone 2:email
private String username; // user name
private Integer referrer; // agent refer userid
private Long pid; //parent id
private Integer deep; // agent deep length
private String path;
private Integer country_id; //
private String country_code; //
@Column(name = "country_id")
private Integer countryIdd; //
@Column(name = "country_code")
private String countryCode; //
private String phone;
private Integer phone_status; // verfied or no
@Column(name = "phone_status")
private Integer phoneStatus; // verfied or no
private String email; //
private Integer email_status;
@Column(name = "email_status")
private Integer emailStatus;
private String avatar; //
private String google_token; // google authontion
private Integer google_status; //
private Integer second_verify;
@Column(name = "google_token")
private String googleToken; // google authontion
@Column(name = "google_status")
private Integer googleStatus; //
@Column(name = "second_verify")
private Integer secondVerify;
private String password; //
private String payword;
private String invite_code;
private String purchase_code;
private Integer user_grade; // default value 1
private Integer user_identity; // user type defalt 1
private Integer is_agency;
private Integer is_palce;
private Integer user_auth_level; //
private Integer is_system;
private Integer contract_deal;
private String login_code;
@Column(name = "invite_code")
private String inviteCode;
@Column(name = "purchase_code")
private String purchaseCode;
@Column(name = "user_grade")
private Integer userGrade; // default value 1
@Column(name = "user_identity")
private Integer userIdentity; // user type defalt 1
@Column(name = "is_agency")
private Integer isAgency;
@Column(name = "is_palce")
private Integer isPalce;
@Column(name = "user_auth_level")
private Integer userAuthLevel; //
@Column(name = "is_system")
private Integer isSystem;
@Column(name = "contract_deal")
private Integer contractDeal;
@Column(name = "login_code")
private String loginCode;
private Integer status;
private Integer trade_status;
private Integer trade_verify;
private Integer contract_anomaly;
private String reg_ip;
private Date last_login_time;
private String last_login_ip;
private Date created_At;
private Date updated_at;
public Long getUser_id() {
return user_id;
}
public void setUser_id(Long user_id) {
this.user_id = user_id;
@Column(name = "trade_status")
private Integer tradeStatus;
@Column(name = "trade_verify")
private Integer tradeVerify;
@Column(name = "contract_anomaly")
private Integer contractAnomaly;
@Column(name = "reg_ip")
private String regIp;
@Column(name = "last_login_time")
private Date lastLoginTime;
@Column(name = "last_login_ip")
private String lastLoginIp;
@Column(name = "created_at")
private Date createdAt;
@Column(name = "update_at")
private Date updatedAt;
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public Long getId() {
@ -82,12 +114,12 @@ public class Users {
this.account = account;
}
public Integer getAccoutn_type() {
return accoutn_type;
public Integer getAccountTpe() {
return accountTpe;
}
public void setAccoutn_type(Integer accoutn_type) {
this.accoutn_type = accoutn_type;
public void setAccountTpe(Integer accountTpe) {
this.accountTpe = accountTpe;
}
public String getUsername() {
@ -130,20 +162,20 @@ public class Users {
this.path = path;
}
public Integer getCountry_id() {
return country_id;
public Integer getCountryIdd() {
return countryIdd;
}
public void setCountry_id(Integer country_id) {
this.country_id = country_id;
public void setCountryIdd(Integer countryIdd) {
this.countryIdd = countryIdd;
}
public String getCountry_code() {
return country_code;
public String getCountryCode() {
return countryCode;
}
public void setCountry_code(String country_code) {
this.country_code = country_code;
public void setCountryCode(String countryCode) {
this.countryCode = countryCode;
}
public String getPhone() {
@ -154,12 +186,12 @@ public class Users {
this.phone = phone;
}
public Integer getPhone_status() {
return phone_status;
public Integer getPhoneStatus() {
return phoneStatus;
}
public void setPhone_status(Integer phone_status) {
this.phone_status = phone_status;
public void setPhoneStatus(Integer phoneStatus) {
this.phoneStatus = phoneStatus;
}
public String getEmail() {
@ -170,12 +202,12 @@ public class Users {
this.email = email;
}
public Integer getEmail_status() {
return email_status;
public Integer getEmailStatus() {
return emailStatus;
}
public void setEmail_status(Integer email_status) {
this.email_status = email_status;
public void setEmailStatus(Integer emailStatus) {
this.emailStatus = emailStatus;
}
public String getAvatar() {
@ -186,28 +218,28 @@ public class Users {
this.avatar = avatar;
}
public String getGoogle_token() {
return google_token;
public String getGoogleToken() {
return googleToken;
}
public void setGoogle_token(String google_token) {
this.google_token = google_token;
public void setGoogleToken(String googleToken) {
this.googleToken = googleToken;
}
public Integer getGoogle_status() {
return google_status;
public Integer getGoogleStatus() {
return googleStatus;
}
public void setGoogle_status(Integer google_status) {
this.google_status = google_status;
public void setGoogleStatus(Integer googleStatus) {
this.googleStatus = googleStatus;
}
public Integer getSecond_verify() {
return second_verify;
public Integer getSecondVerify() {
return secondVerify;
}
public void setSecond_verify(Integer second_verify) {
this.second_verify = second_verify;
public void setSecondVerify(Integer secondVerify) {
this.secondVerify = secondVerify;
}
public String getPassword() {
@ -226,84 +258,84 @@ public class Users {
this.payword = payword;
}
public String getInvite_code() {
return invite_code;
public String getInviteCode() {
return inviteCode;
}
public void setInvite_code(String invite_code) {
this.invite_code = invite_code;
public void setInviteCode(String inviteCode) {
this.inviteCode = inviteCode;
}
public String getPurchase_code() {
return purchase_code;
public String getPurchaseCode() {
return purchaseCode;
}
public void setPurchase_code(String purchase_code) {
this.purchase_code = purchase_code;
public void setPurchaseCode(String purchaseCode) {
this.purchaseCode = purchaseCode;
}
public Integer getUser_grade() {
return user_grade;
public Integer getUserGrade() {
return userGrade;
}
public void setUser_grade(Integer user_grade) {
this.user_grade = user_grade;
public void setUserGrade(Integer userGrade) {
this.userGrade = userGrade;
}
public Integer getUser_identity() {
return user_identity;
public Integer getUserIdentity() {
return userIdentity;
}
public void setUser_identity(Integer user_identity) {
this.user_identity = user_identity;
public void setUserIdentity(Integer userIdentity) {
this.userIdentity = userIdentity;
}
public Integer getIs_agency() {
return is_agency;
public Integer getIsAgency() {
return isAgency;
}
public void setIs_agency(Integer is_agency) {
this.is_agency = is_agency;
public void setIsAgency(Integer isAgency) {
this.isAgency = isAgency;
}
public Integer getUser_auth_level() {
return user_auth_level;
public Integer getIsPalce() {
return isPalce;
}
public void setUser_auth_level(Integer user_auth_level) {
this.user_auth_level = user_auth_level;
public void setIsPalce(Integer isPalce) {
this.isPalce = isPalce;
}
public Integer getIs_palce() {
return is_palce;
public Integer getUserAuthLevel() {
return userAuthLevel;
}
public void setIs_palce(Integer is_palce) {
this.is_palce = is_palce;
public void setUserAuthLevel(Integer userAuthLevel) {
this.userAuthLevel = userAuthLevel;
}
public Integer getIs_system() {
return is_system;
public Integer getIsSystem() {
return isSystem;
}
public void setIs_system(Integer is_system) {
this.is_system = is_system;
public void setIsSystem(Integer isSystem) {
this.isSystem = isSystem;
}
public Integer getContract_deal() {
return contract_deal;
public Integer getContractDeal() {
return contractDeal;
}
public void setContract_deal(Integer contract_deal) {
this.contract_deal = contract_deal;
public void setContractDeal(Integer contractDeal) {
this.contractDeal = contractDeal;
}
public String getLogin_code() {
return login_code;
public String getLoginCode() {
return loginCode;
}
public void setLogin_code(String login_code) {
this.login_code = login_code;
public void setLoginCode(String loginCode) {
this.loginCode = loginCode;
}
public Integer getStatus() {
@ -314,67 +346,67 @@ public class Users {
this.status = status;
}
public Integer getTrade_status() {
return trade_status;
public Integer getTradeStatus() {
return tradeStatus;
}
public void setTrade_status(Integer trade_status) {
this.trade_status = trade_status;
public void setTradeStatus(Integer tradeStatus) {
this.tradeStatus = tradeStatus;
}
public Integer getTrade_verify() {
return trade_verify;
public Integer getTradeVerify() {
return tradeVerify;
}
public void setTrade_verify(Integer trade_verify) {
this.trade_verify = trade_verify;
public void setTradeVerify(Integer tradeVerify) {
this.tradeVerify = tradeVerify;
}
public Integer getContract_anomaly() {
return contract_anomaly;
public Integer getContractAnomaly() {
return contractAnomaly;
}
public void setContract_anomaly(Integer contract_anomaly) {
this.contract_anomaly = contract_anomaly;
public void setContractAnomaly(Integer contractAnomaly) {
this.contractAnomaly = contractAnomaly;
}
public String getReg_ip() {
return reg_ip;
public String getRegIp() {
return regIp;
}
public void setReg_ip(String reg_ip) {
this.reg_ip = reg_ip;
public void setRegIp(String regIp) {
this.regIp = regIp;
}
public Date getLast_login_time() {
return last_login_time;
public Date getLastLoginTime() {
return lastLoginTime;
}
public void setLast_login_time(Date last_login_time) {
this.last_login_time = last_login_time;
public void setLastLoginTime(Date lastLoginTime) {
this.lastLoginTime = lastLoginTime;
}
public String getLast_login_ip() {
return last_login_ip;
public String getLastLoginIp() {
return lastLoginIp;
}
public void setLast_login_ip(String last_login_ip) {
this.last_login_ip = last_login_ip;
public void setLastLoginIp(String lastLoginIp) {
this.lastLoginIp = lastLoginIp;
}
public Date getCreated_At() {
return created_At;
public Date getCreatedAt() {
return createdAt;
}
public void setCreated_At(Date created_At) {
this.created_At = created_At;
public void setCreatedAt(Date createdAt) {
this.createdAt = createdAt;
}
public Date getUpdated_at() {
return updated_at;
public Date getUpdatedAt() {
return updatedAt;
}
public void setUpdated_at(Date updated_at) {
this.updated_at = updated_at;
public void setUpdatedAt(Date updatedAt) {
this.updatedAt = updatedAt;
}
}

5
bccore/src/main/java/bc/mm/core/dao/CountryDao.java
View File

@ -2,14 +2,13 @@ package bc.mm.core.dao;
import bc.mm.core.bean.Country;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Repository;
import java.util.List;
@Component
@Repository
public interface CountryDao extends JpaRepository {
public interface CountryDao extends JpaRepository<Country,Integer> {
// find all
List<Country> findAll();
}

21
bccore/src/main/java/bc/mm/core/dao/CrudDao.java
View File

@ -1,21 +0,0 @@
package bc.mm.core.dao;
import org.aspectj.apache.bcel.util.Repository;
import java.io.Serializable;
import java.util.Optional;
public interface CrudDao<T,ID extends Serializable> extends Repository {
// save
<S extends T> S save(S entity);
// find id
Optional<T> findById(ID id);
//
Iterable<T> findAll();
//
Long count();
//
void deleteById(ID id);
//
void delete(T entity);
}

6
bccore/src/main/resources/application.properties
View File

@ -4,12 +4,12 @@
#spring.datasource.password=root
#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
# print SQL
spring.jpa.show-sql=true
#spring.jpa.show-sql=true
#
spring.jpa.database-platform=org.hibernate.dialect.MySQL5Dialect
#spring.jpa.database-platform=org.hibernate.dialect.MySQL5Dialect
#解决Spring Boot集成JPA的Column注解命名字段会自动生成下划线的问题（命名规则）
spring.jpa.hibernate.naming-strategy=org.hibernate.cfg.ImprovedNamingStrategy
#spring.jpa.hibernate.naming-strategy=org.hibernate.cfg.ImprovedNamingStrategy
# 驼峰规则
# spring.jpa.hibernate.naming.physical-strategy = org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl

Write Preview
Loading…
Cancel
Save